From d641cb22459acadb258f58371331c3cbc6fa3fe4 Mon Sep 17 00:00:00 2001
From: Florent Daigniere <nextgens@freenetproject.org>
Date: Sun, 5 Jan 2025 11:59:56 +0100
Subject: [PATCH 1/2] Clarify ip listen address setting

(cherry picked from commit a9fb51256744fc53b301eb6de78119d53ff3e3bc)
---
 setup/templates/steps/compose/03_expose.html | 4 ++--
 towncrier/newsfragments/3680.misc            | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)
 create mode 100644 towncrier/newsfragments/3680.misc

diff --git a/setup/templates/steps/compose/03_expose.html b/setup/templates/steps/compose/03_expose.html
index e928fccf..6608943b 100644
--- a/setup/templates/steps/compose/03_expose.html
+++ b/setup/templates/steps/compose/03_expose.html
@@ -10,8 +10,8 @@ IP addresses in order to expose its public services. You must at least set up
 an IPv4 or an IPv6 address if you wish to access Mailu.</p>
 
 <p><span class="label label-warning">Warning</span> You must use specific addresses, please
-avoid generic all-interfaces addresses like <code>0.0.0.0</code> or <code>::</code>.
-<a href="https://mailu.io/{{ version }}/compose/setup.html#bind-address">How to find these addresses.</a></p>
+avoid generic all-interfaces addresses like <code>0.0.0.0</code> or <code>::</code>. If you still want to use generic addresses you should disable <code>userland-proxy</code>.
+<a href="https://mailu.io/{{ version }}/compose/setup.html#bind-address">How to find these addresses.</a> <a href="https://mailu.io/{{ version }}/faq.html#how-to-make-ipv6-work">How to disable userland-proxy.</a></p>
 
 <div class="form-group">
   <label>IPv4 listen address</label>
diff --git a/towncrier/newsfragments/3680.misc b/towncrier/newsfragments/3680.misc
new file mode 100644
index 00000000..bc9593cd
--- /dev/null
+++ b/towncrier/newsfragments/3680.misc
@@ -0,0 +1 @@
+Modern docker versions enable the userland-proxy by default, clarify in setup that unless the bindto address is specific that will create problems.

From 4b29ac83b5e09bd9da7db7684142d89908525cd2 Mon Sep 17 00:00:00 2001
From: Florent Daigniere <nextgens@freenetproject.org>
Date: Sun, 5 Jan 2025 12:05:29 +0100
Subject: [PATCH 2/2] Strenghten the language further

(cherry picked from commit 9f8ce15b59387b1887b1d208069b06c9cbdd4965)
---
 setup/templates/steps/compose/03_expose.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup/templates/steps/compose/03_expose.html b/setup/templates/steps/compose/03_expose.html
index 6608943b..fe6ae8aa 100644
--- a/setup/templates/steps/compose/03_expose.html
+++ b/setup/templates/steps/compose/03_expose.html
@@ -10,7 +10,7 @@ IP addresses in order to expose its public services. You must at least set up
 an IPv4 or an IPv6 address if you wish to access Mailu.</p>
 
 <p><span class="label label-warning">Warning</span> You must use specific addresses, please
-avoid generic all-interfaces addresses like <code>0.0.0.0</code> or <code>::</code>. If you still want to use generic addresses you should disable <code>userland-proxy</code>.
+avoid generic all-interfaces addresses like <code>0.0.0.0</code> or <code>::</code>. If you still want to use generic addresses you <b>MUST</b> disable <code>userland-proxy</code>; failing to do so will turn your Mailu installation into an open-relay.
 <a href="https://mailu.io/{{ version }}/compose/setup.html#bind-address">How to find these addresses.</a> <a href="https://mailu.io/{{ version }}/faq.html#how-to-make-ipv6-work">How to disable userland-proxy.</a></p>
 
 <div class="form-group">