From f39bb2044349daaf2f082f6428aea4ba251bf6cd Mon Sep 17 00:00:00 2001
From: Marco Kundt <mrckndt@riseup.net>
Date: Mon, 12 Apr 2021 13:15:21 +0200
Subject: [PATCH] rename cert and key to a more generic name

---
 docker-compose.yml    | 4 ++--
 env.example           | 6 ++++--
 nginx/mattermost.conf | 4 ++--
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index a422462..c0aa7ae 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -19,9 +19,9 @@ services:
     restart: unless-stopped
     volumes:
       - ${NGINX_MATTERMOST_CONFIG}:/etc/nginx/conf.d/mattermost.conf:ro
-      - ${LETSENCRYPT_FULLCHAIN_PATH}:/fullchain.pem:ro
-      - ${LETSENCRYPT_PRIVKEY_PATH}:/privkey.pem:ro
       - ${NGINX_DHPARAMS_FILE}:/dhparams4096.pem
+      - ${CERT_PATH}:/cert.pem:ro
+      - ${KEY_PATH}:/key.pem:ro
       - /etc/localtime:/etc/localtime:ro
     ports:
       - ${HTTPS_PORT}:443
diff --git a/env.example b/env.example
index af1b302..47c9404 100644
--- a/env.example
+++ b/env.example
@@ -15,9 +15,11 @@ POSTGRES_DATA_PATH=./data/postgres  # relative paths will work but absolute are
 ## Inside the container the uid and gid is 101. The folder owner can be set with
 ## `sudo chown -R 101:101 ./data/mattermost`.
 NGINX_MATTERMOST_CONFIG=./nginx/mattermost.conf
-LETSENCRYPT_FULLCHAIN_PATH=./certs/fullchain.pem
-LETSENCRYPT_PRIVKEY_PATH=./certs/privkey.pem
 NGINX_DHPARAMS_FILE=./nginx/dhparams4096.pem
+
+CERT_PATH=./certs/fullchain.pem
+KEY_PATH=./certs/privkey.pem
+
 ## Exposed ports to the host. Inside the container 80 and 443 will be used
 HTTPS_PORT=443
 HTTP_PORT=80
diff --git a/nginx/mattermost.conf b/nginx/mattermost.conf
index 9773f5b..b7905dd 100644
--- a/nginx/mattermost.conf
+++ b/nginx/mattermost.conf
@@ -38,8 +38,8 @@ server {
     ssl_prefer_server_ciphers off;
 
     # certs sent to the client in SERVER HELLO are concatenated in ssl_certificate
-    ssl_certificate /fullchain.pem;
-    ssl_certificate_key /privkey.pem;
+    ssl_certificate /cert.pem;
+    ssl_certificate_key /key.pem;
 
     # OCSP stapling
     ssl_stapling on;