From e326393f03645531aecce6f7ee4f0e192207d9a2 Mon Sep 17 00:00:00 2001 From: Florent Daigniere Date: Sun, 29 Jan 2023 15:47:19 +0100 Subject: [PATCH 1/3] fix ooo --- core/rspamd/conf/options.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/rspamd/conf/options.inc b/core/rspamd/conf/options.inc index 22bae565..dc1757c7 100644 --- a/core/rspamd/conf/options.inc +++ b/core/rspamd/conf/options.inc @@ -1,3 +1,3 @@ {% if RELAYNETS %} -local_networks = [{{ RELAYNETS }}]; +local_networks = [{{ RELAYNETS }},{{ SUBNET }}{% if SUBNET6 %}, {{ SUBNET6 }}{% endif %}]; {% endif %} From 61f6e6018b1f51acdd798bfdd54fe9b839fadaf5 Mon Sep 17 00:00:00 2001 From: Florent Daigniere Date: Sun, 29 Jan 2023 15:48:50 +0100 Subject: [PATCH 2/3] towncrier --- towncrier/newsfragments/2635.bugfix | 1 + 1 file changed, 1 insertion(+) create mode 100644 towncrier/newsfragments/2635.bugfix diff --git a/towncrier/newsfragments/2635.bugfix b/towncrier/newsfragments/2635.bugfix new file mode 100644 index 00000000..7c7a3f15 --- /dev/null +++ b/towncrier/newsfragments/2635.bugfix @@ -0,0 +1 @@ +Fix sieve/out of office replies by adding SUBNET to rspamd's local_networks From ae7061c5613539320d07ab386876c3cc0db02e90 Mon Sep 17 00:00:00 2001 From: Florent Daigniere Date: Mon, 30 Jan 2023 10:29:37 +0100 Subject: [PATCH 3/3] Doh --- core/rspamd/conf/options.inc | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/core/rspamd/conf/options.inc b/core/rspamd/conf/options.inc index dc1757c7..6ccbfb0a 100644 --- a/core/rspamd/conf/options.inc +++ b/core/rspamd/conf/options.inc @@ -1,3 +1 @@ -{% if RELAYNETS %} -local_networks = [{{ RELAYNETS }},{{ SUBNET }}{% if SUBNET6 %}, {{ SUBNET6 }}{% endif %}]; -{% endif %} +local_networks = [{{ SUBNET }}{% if SUBNET6 %}, {{ SUBNET6 }}{% endif %}{% if RELAYNETS %}, {{ RELAYNETS }}{% endif %}];