From 848d38c88c056280fc2fc10b6789eaf6c86b25f0 Mon Sep 17 00:00:00 2001
From: Marco Kundt <mrckndt@riseup.net>
Date: Tue, 27 Apr 2021 12:05:52 +0200
Subject: [PATCH] use path to nginx config instead of config file itself

---
 docker-compose.nginx.yml           | 2 +-
 env.example                        | 3 ++-
 nginx/{ => conf.d}/mattermost.conf | 0
 3 files changed, 3 insertions(+), 2 deletions(-)
 rename nginx/{ => conf.d}/mattermost.conf (100%)

diff --git a/docker-compose.nginx.yml b/docker-compose.nginx.yml
index faf2508..81976ca 100644
--- a/docker-compose.nginx.yml
+++ b/docker-compose.nginx.yml
@@ -10,7 +10,7 @@ services:
     image: nginx:${NGINX_IMAGE_TAG}
     restart: ${RESTART_POLICY}
     volumes:
-      - ${NGINX_MATTERMOST_CONFIG}:/etc/nginx/conf.d/mattermost.conf:ro
+      - ${NGINX_CONFIG_PATH}:/etc/nginx/conf.d:ro
       - ${NGINX_DHPARAMS_FILE}:/dhparams4096.pem
       - ${CERT_PATH}:/cert.pem:ro
       - ${KEY_PATH}:/key.pem:ro
diff --git a/env.example b/env.example
index 844cc4a..f8a2fb3 100644
--- a/env.example
+++ b/env.example
@@ -28,7 +28,8 @@ POSTGRES_DB=mattermost
 ## `sudo chown -R 101:101 ./nginx` if needed.
 NGINX_IMAGE_TAG=alpine
 
-NGINX_MATTERMOST_CONFIG=./nginx/mattermost.conf
+## The folder containing server blocks and any additional config to nginx.conf
+NGINX_CONFIG_PATH=./nginx/conf.d
 NGINX_DHPARAMS_FILE=./nginx/dhparams4096.pem
 
 CERT_PATH=./volumes/web/cert/cert.pem
diff --git a/nginx/mattermost.conf b/nginx/conf.d/mattermost.conf
similarity index 100%
rename from nginx/mattermost.conf
rename to nginx/conf.d/mattermost.conf