From 486a8cc1bf0cdb4f80839eb2c259ca6b5e8489e5 Mon Sep 17 00:00:00 2001 From: Stephane de Labrusse Date: Sun, 1 Dec 2019 10:02:21 +0100 Subject: [PATCH] Maps creation (reduce log noise) --- filter/etc/rspamd/dkim_whitelist.inc | 3 --- .../rspamd/local.d/maps.d/dkim_whitelist.inc.local | 3 +++ .../rspamd/local.d/maps.d/dmarc_whitelist.inc.local | 3 +++ .../local.d/maps.d/greylist-whitelist-domains.inc | 3 +++ filter/etc/rspamd/local.d/maps.d/mid.inc | 3 +++ .../etc/rspamd/local.d/maps.d/mime_types.inc.local | 3 +++ filter/etc/rspamd/local.d/maps.d/redirectors.inc | 3 +++ .../local.d/maps.d/spf_dkim_whitelist.inc.local | 3 +++ .../rspamd/local.d/maps.d/spf_whitelist.inc.local | 3 +++ .../rspamd/local.d/maps.d/surbl-whitelist.inc.local | 3 +++ filter/etc/rspamd/local.d/mid.inc | 3 --- filter/etc/rspamd/spf_whitelist.inc | 3 --- nethserver-mail.spec | 12 +++++++++--- 13 files changed, 36 insertions(+), 12 deletions(-) delete mode 100644 filter/etc/rspamd/dkim_whitelist.inc create mode 100644 filter/etc/rspamd/local.d/maps.d/dkim_whitelist.inc.local create mode 100644 filter/etc/rspamd/local.d/maps.d/dmarc_whitelist.inc.local create mode 100644 filter/etc/rspamd/local.d/maps.d/greylist-whitelist-domains.inc create mode 100644 filter/etc/rspamd/local.d/maps.d/mid.inc create mode 100644 filter/etc/rspamd/local.d/maps.d/mime_types.inc.local create mode 100644 filter/etc/rspamd/local.d/maps.d/redirectors.inc create mode 100644 filter/etc/rspamd/local.d/maps.d/spf_dkim_whitelist.inc.local create mode 100644 filter/etc/rspamd/local.d/maps.d/spf_whitelist.inc.local create mode 100644 filter/etc/rspamd/local.d/maps.d/surbl-whitelist.inc.local delete mode 100644 filter/etc/rspamd/local.d/mid.inc delete mode 100644 filter/etc/rspamd/spf_whitelist.inc diff --git a/filter/etc/rspamd/dkim_whitelist.inc b/filter/etc/rspamd/dkim_whitelist.inc deleted file mode 100644 index 70cfce71..00000000 --- a/filter/etc/rspamd/dkim_whitelist.inc +++ /dev/null @@ -1,3 +0,0 @@ -# -# Map configuration file for rspamd -# diff --git a/filter/etc/rspamd/local.d/maps.d/dkim_whitelist.inc.local b/filter/etc/rspamd/local.d/maps.d/dkim_whitelist.inc.local new file mode 100644 index 00000000..11eddef2 --- /dev/null +++ b/filter/etc/rspamd/local.d/maps.d/dkim_whitelist.inc.local @@ -0,0 +1,3 @@ +# +# dkim_whitelist.inc.local +# diff --git a/filter/etc/rspamd/local.d/maps.d/dmarc_whitelist.inc.local b/filter/etc/rspamd/local.d/maps.d/dmarc_whitelist.inc.local new file mode 100644 index 00000000..2a5cad45 --- /dev/null +++ b/filter/etc/rspamd/local.d/maps.d/dmarc_whitelist.inc.local @@ -0,0 +1,3 @@ +# +# dmarc_whitelist.inc.local +# diff --git a/filter/etc/rspamd/local.d/maps.d/greylist-whitelist-domains.inc b/filter/etc/rspamd/local.d/maps.d/greylist-whitelist-domains.inc new file mode 100644 index 00000000..0293c237 --- /dev/null +++ b/filter/etc/rspamd/local.d/maps.d/greylist-whitelist-domains.inc @@ -0,0 +1,3 @@ +# +# greylist-whitelist-domains.inc +# diff --git a/filter/etc/rspamd/local.d/maps.d/mid.inc b/filter/etc/rspamd/local.d/maps.d/mid.inc new file mode 100644 index 00000000..7e84e1a1 --- /dev/null +++ b/filter/etc/rspamd/local.d/maps.d/mid.inc @@ -0,0 +1,3 @@ +# +# mid.inc +# diff --git a/filter/etc/rspamd/local.d/maps.d/mime_types.inc.local b/filter/etc/rspamd/local.d/maps.d/mime_types.inc.local new file mode 100644 index 00000000..d55b7025 --- /dev/null +++ b/filter/etc/rspamd/local.d/maps.d/mime_types.inc.local @@ -0,0 +1,3 @@ +# +# mime_types.inc.local +# diff --git a/filter/etc/rspamd/local.d/maps.d/redirectors.inc b/filter/etc/rspamd/local.d/maps.d/redirectors.inc new file mode 100644 index 00000000..88716755 --- /dev/null +++ b/filter/etc/rspamd/local.d/maps.d/redirectors.inc @@ -0,0 +1,3 @@ +# +# redirectors.inc +# diff --git a/filter/etc/rspamd/local.d/maps.d/spf_dkim_whitelist.inc.local b/filter/etc/rspamd/local.d/maps.d/spf_dkim_whitelist.inc.local new file mode 100644 index 00000000..b1572475 --- /dev/null +++ b/filter/etc/rspamd/local.d/maps.d/spf_dkim_whitelist.inc.local @@ -0,0 +1,3 @@ +# +# spf_dkim_whitelist.inc.local +# diff --git a/filter/etc/rspamd/local.d/maps.d/spf_whitelist.inc.local b/filter/etc/rspamd/local.d/maps.d/spf_whitelist.inc.local new file mode 100644 index 00000000..1ef50c55 --- /dev/null +++ b/filter/etc/rspamd/local.d/maps.d/spf_whitelist.inc.local @@ -0,0 +1,3 @@ +# +# spf_whitelist.inc.local +# diff --git a/filter/etc/rspamd/local.d/maps.d/surbl-whitelist.inc.local b/filter/etc/rspamd/local.d/maps.d/surbl-whitelist.inc.local new file mode 100644 index 00000000..2396de1f --- /dev/null +++ b/filter/etc/rspamd/local.d/maps.d/surbl-whitelist.inc.local @@ -0,0 +1,3 @@ +# +# surbl-whitelist.inc.local +# diff --git a/filter/etc/rspamd/local.d/mid.inc b/filter/etc/rspamd/local.d/mid.inc deleted file mode 100644 index 70cfce71..00000000 --- a/filter/etc/rspamd/local.d/mid.inc +++ /dev/null @@ -1,3 +0,0 @@ -# -# Map configuration file for rspamd -# diff --git a/filter/etc/rspamd/spf_whitelist.inc b/filter/etc/rspamd/spf_whitelist.inc deleted file mode 100644 index 70cfce71..00000000 --- a/filter/etc/rspamd/spf_whitelist.inc +++ /dev/null @@ -1,3 +0,0 @@ -# -# Map configuration file for rspamd -# diff --git a/nethserver-mail.spec b/nethserver-mail.spec index c6496c2d..4b7767e4 100644 --- a/nethserver-mail.spec +++ b/nethserver-mail.spec @@ -189,9 +189,15 @@ EOF cat >>filter.lst <<'EOF' %dir %{_nseventsdir}/%{name}-filter-update %dir %attr(0755,redis,redis) /var/lib/redis/rspamd -%config(noreplace) %attr(0440,_rspamd,_rspamd) /etc/rspamd/dkim_whitelist.inc -%config(noreplace) %attr(0440,_rspamd,_rspamd) /etc/rspamd/local.d/mid.inc -%config(noreplace) %attr(0440,_rspamd,_rspamd) /etc/rspamd/spf_whitelist.inc +%config(noreplace) %attr(0440,_rspamd,_rspamd) /etc/rspamd/local.d/maps.d/dkim_whitelist.inc.local +%config(noreplace) %attr(0440,_rspamd,_rspamd) /etc/rspamd/local.d/maps.d/dmarc_whitelist.inc.local +%config(noreplace) %attr(0440,_rspamd,_rspamd) /etc/rspamd/local.d/maps.d/greylist-whitelist-domains.inc +%config(noreplace) %attr(0440,_rspamd,_rspamd) /etc/rspamd/local.d/maps.d/mid.inc +%config(noreplace) %attr(0440,_rspamd,_rspamd) /etc/rspamd/local.d/maps.d/mime_types.inc.local +%config(noreplace) %attr(0440,_rspamd,_rspamd) /etc/rspamd/local.d/maps.d/redirectors.inc +%config(noreplace) %attr(0440,_rspamd,_rspamd) /etc/rspamd/local.d/maps.d/spf_dkim_whitelist.inc.local +%config(noreplace) %attr(0440,_rspamd,_rspamd) /etc/rspamd/local.d/maps.d/spf_whitelist.inc.local +%config(noreplace) %attr(0440,_rspamd,_rspamd) /etc/rspamd/local.d/maps.d/surbl-whitelist.inc.local %config(noreplace) %attr(0640,_rspamd,_rspamd) /var/lib/rspamd/2tld.inc.local %config(noreplace) %attr(0640,_rspamd,_rspamd) /var/lib/rspamd/dkim_whitelist.inc.local %config(noreplace) %attr(0640,_rspamd,_rspamd) /var/lib/rspamd/dmarc_whitelist.inc.local