Merge pull request #713 from pgeorgi/extend-nginx

nginx: Allow extending config with overrides

core/nginx/Dockerfile

@@ -14,6 +14,7 @@ COPY *.py /
 
 EXPOSE 80/tcp 443/tcp 110/tcp 143/tcp 465/tcp 587/tcp 993/tcp 995/tcp 25/tcp 10025/tcp 10143/tcp
 VOLUME ["/certs"]
+VOLUME ["/overrides"]
 
 CMD /start.py
 

core/nginx/conf/nginx.conf

@@ -84,14 +84,19 @@ http {
       }
       {% else %}
 
-      # Actual logic
+      include /overrides/*.conf;
-      {% if WEBMAIL != 'none' %}
-      {% if WEB_WEBMAIL != '/' %}
-      location / {
-        return 301 {{ WEB_WEBMAIL }};
-      }
-      {% endif %}
 
+      # Actual logic
+
+      location / {
+      {% if WEBROOT_REDIRECT and WEB_WEBMAIL != '/' %}
+        return 301 {{ WEBROOT_REDIRECT }};
+      {% else %}
+        return 404;
+      {% endif %}
+      }
+
+      {% if WEBMAIL != 'none' %}
       location {{ WEB_WEBMAIL }} {
         {% if WEB_WEBMAIL != '/' %}
         rewrite ^({{ WEB_WEBMAIL }})$ $1/ permanent;

docs/compose/.env

@@ -100,6 +100,9 @@ COMPRESSION_LEVEL=
 # Web settings
 ###################################
 
+# Path to redirect / to
+WEBROOT_REDIRECT=/webmail
+
 # Path to the admin interface if enabled
 WEB_ADMIN=/admin
 

docs/compose/docker-compose.yml

@@ -29,6 +29,7 @@ services:
     - "$BIND_ADDRESS6:587:587"
     volumes:
       - "$ROOT/certs:/certs"
+      - "$ROOT/overrides/nginx:/overrides"
 
   redis:
     image: redis:alpine

setup/flavors/compose/docker-compose.yml

@@ -32,7 +32,8 @@ services:
     {% endfor %}
     volumes:
       - "{{ root }}/certs:/certs"
-      
+      - "{{ root }}/overrides/nginx:/overrides"
+
   {% if resolver_enabled %}
   resolver:
     image: mailu/unbound:{{ version }}

setup/flavors/compose/mailu.env

@@ -111,6 +111,9 @@ COMPRESSION_LEVEL={{ compression_level }}
 # Web settings
 ###################################
 
+# Path to redirect / to
+WEBROOT_REDIRECT=/webmail
+
 # Path to the admin interface if enabled
 WEB_ADMIN={{ admin_path }}
 

setup/flavors/stack/docker-compose.yml

@@ -27,6 +27,7 @@ services:
     {% endfor %}
     volumes:
       - "{{ root }}/certs:/certs"
+      - "{{ root }}/overrides/nginx:/overrides"
     deploy:
       replicas: {{ front_replicas }}