From 10c02c0a32d0e9f0e25f02327e6299df94372e6f Mon Sep 17 00:00:00 2001 From: Dimitri Huisman Date: Fri, 5 Aug 2022 13:39:12 +0000 Subject: [PATCH 1/2] Fix error in reverse proxy example for how to include nginx override. Also clarified where the file is included in the nginx configuration file. --- docs/reverse.rst | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/docs/reverse.rst b/docs/reverse.rst index 28c340f8..65bca7cb 100644 --- a/docs/reverse.rst +++ b/docs/reverse.rst @@ -244,7 +244,9 @@ Override Mailu configuration ---------------------------- If you do not have the resources for running a separate reverse proxy, you could override Mailu reverse proxy configuration by using a Docker volume. -Simply store your configuration file (Nginx format), in ``/mailu/nginx.conf`` for instance. +Simply store your configuration file (Nginx format), in ``/mailu/overrides/nginx.conf`` for instance. +All *.conf files will be included in the main server block of Mailu in nginx which listens on port 80/443. +Add location blocks for any services that must be proxied. Then modify your ``docker-compose.yml`` file and change the ``front`` section to add a mount: @@ -259,7 +261,7 @@ Then modify your ``docker-compose.yml`` file and change the ``front`` section to [...] volumes: - "$ROOT/certs:/certs" - - "$ROOT/nginx.conf:/etc/nginx/nginx.conf" + - "$ROOT/overrides/nginx:/overrides" You can also download the example configuration files: From a54baeff000f49e71953bf7e032aa7c6fa3c7663 Mon Sep 17 00:00:00 2001 From: Dimitri Huisman Date: Fri, 5 Aug 2022 15:42:37 +0000 Subject: [PATCH 2/2] Fixed error in reverse.rst and remove unneeded example block. --- docs/reverse.rst | 21 +++------------------ 1 file changed, 3 insertions(+), 18 deletions(-) diff --git a/docs/reverse.rst b/docs/reverse.rst index 65bca7cb..a5a12bfb 100644 --- a/docs/reverse.rst +++ b/docs/reverse.rst @@ -243,26 +243,11 @@ Refer to the Traefik documentation for more details. Override Mailu configuration ---------------------------- -If you do not have the resources for running a separate reverse proxy, you could override Mailu reverse proxy configuration by using a Docker volume. -Simply store your configuration file (Nginx format), in ``/mailu/overrides/nginx.conf`` for instance. -All *.conf files will be included in the main server block of Mailu in nginx which listens on port 80/443. +If you do not have the resources for running a separate reverse proxy, you could override Mailu reverse proxy configuration by using :ref:`an override`. +Simply store your configuration file (Nginx format), in ``/mailu/overrides/nginx.conf``. +All ``*.conf`` files will be included in the main server block of Mailu in nginx which listens on port 80/443. Add location blocks for any services that must be proxied. -Then modify your ``docker-compose.yml`` file and change the ``front`` section to add a mount: - -.. code-block:: nginx - - front: - build: nginx - image: mailu/nginx:$VERSION - restart: always - env_file: .env - ports: - [...] - volumes: - - "$ROOT/certs:/certs" - - "$ROOT/overrides/nginx:/overrides" - You can also download the example configuration files: - :download:`compose/traefik/docker-compose.yml`