From ef71bc04cb27f6ed0779584afcc8690fbf20048a Mon Sep 17 00:00:00 2001
From: Patryk Tech <git@patryk.tech>
Date: Thu, 1 Oct 2020 13:51:06 +0300
Subject: [PATCH 1/2] Update docs/reverse.rst with Traefik v2+ info

---
 docs/reverse.rst                 | 41 ++++++++++++++++++++++++++++++--
 towncrier/newsfragments/1503.doc |  1 +
 2 files changed, 40 insertions(+), 2 deletions(-)
 create mode 100644 towncrier/newsfragments/1503.doc

diff --git a/docs/reverse.rst b/docs/reverse.rst
index 9a7a7dc0..f3b3e7bd 100644
--- a/docs/reverse.rst
+++ b/docs/reverse.rst
@@ -154,7 +154,40 @@ Add the respective Traefik labels for your domain/configuration, like
 If your Traefik is configured to automatically request certificates from *letsencrypt*, then you’ll have a certificate for ``mail.your.doma.in`` now. However,
 ``mail.your.doma.in`` might only be the location where you want the Mailu web-interfaces to live — your mail should be sent/received from ``your.doma.in``,
 and this is the ``DOMAIN`` in your ``.env``?
-To support that use-case, Traefik can request ``SANs`` for your domain. Lets add something like
+To support that use-case, Traefik can request ``SANs`` for your domain. The configuration for this will depend on your Traefik version.
+
+----
+
+Traefik 2.x using labels configuration
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Add the appropriate labels for your domain(s) to the ``front`` container in ``docker-compose.yml``.
+
+.. code-block:: yaml
+
+  services:
+    front:
+      labels:
+        # Enable TLS
+        - "traefik.http.routers.mailu-secure.tls"
+        # Your main domain
+        - "traefik.http.routers.mailu-secure.tls.domains[0].main=your.doma.in"
+        # Optional SANs for your main domain
+        - "traefik.http.routers.mailu-secure.tls.domains[0].sans=mail.your.doma.in,webmail.your.doma.in,smtp.your.doma.in"
+        # Optionally add other domains
+        - "traefik.http.routers.mailu-secure.tls.domains[1].main=mail.other.doma.in"
+        - "traefik.http.routers.mailu-secure.tls.domains[1].sans=mail2.other.doma.in,mail3.other.doma.in"
+        # Your ACME certificate resolver
+        - "traefik.http.routers.mailu-secure.tls.certResolver=foo"
+
+Of course, be sure to define the Certificate Resolver ``foo`` in the static configuration as well.
+
+Alternatively, you can define SANs in the Traefik static configuration using routers, or in the static configuration using entrypoints. Refer to the Traefik documentation for more details.
+
+Traefik 1.x with TOML configuration
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Lets add something like
 
 .. code-block:: yaml
 
@@ -163,7 +196,11 @@ To support that use-case, Traefik can request ``SANs`` for your domain. Lets add
       main = "your.doma.in" # this is the same as $TRAEFIK_DOMAIN!
       sans = ["mail.your.doma.in", "webmail.your.doma.in", "smtp.your.doma.in"]
 
-to your ``traefik.toml``. You might need to clear your ``acme.json``, if a certificate for one of these domains already exists.
+to your ``traefik.toml``.
+
+----
+
+You might need to clear your ``acme.json``, if a certificate for one of these domains already exists.
 
 You will need some solution which dumps the certificates in ``acme.json``, so you can include them in the ``mailu/front`` container.
 One such example is ``mailu/traefik-certdumper``, which has been adapted for use in Mailu. You can add it to your ``docker-compose.yml`` like:
diff --git a/towncrier/newsfragments/1503.doc b/towncrier/newsfragments/1503.doc
new file mode 100644
index 00000000..9c59feb7
--- /dev/null
+++ b/towncrier/newsfragments/1503.doc
@@ -0,0 +1 @@
+Add documentation for Traefik 2 in Reverse Proxy
\ No newline at end of file

From 32f6a23a95de6d5ee2d64eecc452469967289fdf Mon Sep 17 00:00:00 2001
From: cbachert <cbachert@users.noreply.github.com>
Date: Fri, 30 Oct 2020 17:12:34 +0000
Subject: [PATCH 2/2] Remove rspamd unused env var from start script

Environment variable FRONT_ADDRESS is unused in rspamd
FRONT_ADDRESS references were removed with commit 8172f3e in PR #727
---
 core/rspamd/start.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/core/rspamd/start.py b/core/rspamd/start.py
index bde708f2..e2e72bcb 100755
--- a/core/rspamd/start.py
+++ b/core/rspamd/start.py
@@ -10,7 +10,6 @@ log.basicConfig(stream=sys.stderr, level=os.environ.get("LOG_LEVEL", "WARNING"))
 
 # Actual startup script
 
-os.environ["FRONT_ADDRESS"] = system.get_host_address_from_environment("FRONT", "front")
 os.environ["REDIS_ADDRESS"] = system.get_host_address_from_environment("REDIS", "redis")
 
 if os.environ.get("ANTIVIRUS") == 'clamav':