mirror of
https://github.com/Mailu/Mailu.git
synced 2025-03-03 14:52:36 +02:00
Merge #3178
3178: Fix ooo/sieve when proxy protocol is in use r=mergify[bot] a=nextgens ## What type of PR? bug-fix ## What does this PR do? Fix ooo/sieve when proxy protocol is in use; If it is enabled we shouldn't talk to front but to the proxy. I am not proposing to backport this; it will be a 2.1 thing. ### Related issue(s) - close #3172 - close #3159 ## Prerequisites Before we can consider review and merge, please make sure the following list is done and checked. If an entry in not applicable, you can check it or remove it from the list. - [ ] In case of feature or enhancement: documentation updated accordingly - [x] Unless it's docs or a minor change: add [changelog](https://mailu.io/master/contributors/workflow.html#changelog) entry file. Co-authored-by: Florent Daigniere <nextgens@freenetproject.org>
This commit is contained in:
commit
d752e96805
@ -5,7 +5,11 @@ log_path = /dev/stderr
|
||||
protocols = imap pop3 lmtp sieve
|
||||
postmaster_address = {{ POSTMASTER }}@{{ DOMAIN }}
|
||||
hostname = {{ HOSTNAMES.split(",")[0] }}
|
||||
{%- if PROXY_PROTOCOL in ['all', 'all-but-http', 'mail'] %}
|
||||
submission_host = {{ HOSTNAMES.split(",")[0] }}
|
||||
{% else %}
|
||||
submission_host = {{ FRONT_ADDRESS }}
|
||||
{% endif %}
|
||||
{%- if SUBNET6 %}
|
||||
listen = *,::
|
||||
{% else %}
|
||||
|
1
towncrier/newsfragments/3172.bugfix
Normal file
1
towncrier/newsfragments/3172.bugfix
Normal file
@ -0,0 +1 @@
|
||||
Fix ooo/sieve replies when proxy protocol is in use
|
Loading…
x
Reference in New Issue
Block a user