From 46a76764ad32ea497ecce5fa6ff2986ea2eeb4e7 Mon Sep 17 00:00:00 2001 From: Daniel Winzen Date: Sun, 2 Jun 2024 15:33:08 +0200 Subject: [PATCH] Updated configs --- etc/postfix/main.cf | 8 ++++---- {usr/local/etc => etc}/rspamd/local.d/actions.conf | 0 {usr/local/etc => etc}/rspamd/local.d/antivirus.conf | 0 {usr/local/etc => etc}/rspamd/local.d/arc.conf | 4 ++-- .../etc => etc}/rspamd/local.d/classifier-bayes.conf | 0 {usr/local/etc => etc}/rspamd/local.d/dkim_signing.conf | 4 ++-- {usr/local/etc => etc}/rspamd/local.d/greylist.conf | 0 {usr/local/etc => etc}/rspamd/local.d/groups.conf | 0 {usr/local/etc => etc}/rspamd/local.d/logging.inc | 0 {usr/local/etc => etc}/rspamd/local.d/options.inc | 0 {usr/local/etc => etc}/rspamd/local.d/phishing.conf | 0 {usr/local/etc => etc}/rspamd/local.d/ratelimit.conf | 0 {usr/local/etc => etc}/rspamd/local.d/redis.conf | 0 .../etc => etc}/rspamd/local.d/statistics_group.conf | 0 {usr/local/etc => etc}/rspamd/local.d/worker-fuzzy.inc | 0 {usr/local/etc => etc}/rspamd/local.d/worker-proxy.inc | 0 {usr/local/etc => etc}/rspamd/lua/rspamd.local.lua | 0 {usr/local/etc => etc}/rspamd/override.d/fuzzy_check.conf | 0 .../etc => etc}/rspamd/override.d/worker-controller.inc | 0 install_binaries.sh | 2 +- 20 files changed, 9 insertions(+), 9 deletions(-) rename {usr/local/etc => etc}/rspamd/local.d/actions.conf (100%) rename {usr/local/etc => etc}/rspamd/local.d/antivirus.conf (100%) rename {usr/local/etc => etc}/rspamd/local.d/arc.conf (59%) rename {usr/local/etc => etc}/rspamd/local.d/classifier-bayes.conf (100%) rename {usr/local/etc => etc}/rspamd/local.d/dkim_signing.conf (70%) rename {usr/local/etc => etc}/rspamd/local.d/greylist.conf (100%) rename {usr/local/etc => etc}/rspamd/local.d/groups.conf (100%) rename {usr/local/etc => etc}/rspamd/local.d/logging.inc (100%) rename {usr/local/etc => etc}/rspamd/local.d/options.inc (100%) rename {usr/local/etc => etc}/rspamd/local.d/phishing.conf (100%) rename {usr/local/etc => etc}/rspamd/local.d/ratelimit.conf (100%) rename {usr/local/etc => etc}/rspamd/local.d/redis.conf (100%) rename {usr/local/etc => etc}/rspamd/local.d/statistics_group.conf (100%) rename {usr/local/etc => etc}/rspamd/local.d/worker-fuzzy.inc (100%) rename {usr/local/etc => etc}/rspamd/local.d/worker-proxy.inc (100%) rename {usr/local/etc => etc}/rspamd/lua/rspamd.local.lua (100%) rename {usr/local/etc => etc}/rspamd/override.d/fuzzy_check.conf (100%) rename {usr/local/etc => etc}/rspamd/override.d/worker-controller.inc (100%) diff --git a/etc/postfix/main.cf b/etc/postfix/main.cf index d65fb38..690d590 100644 --- a/etc/postfix/main.cf +++ b/etc/postfix/main.cf @@ -49,10 +49,10 @@ smtp_tls_chain_files = /etc/postfix/danwin1210-mail.chain smtpd_tls_received_header = yes #lookup maps for domains and email addresses -relay_domains = torbox.danwin1210.me torbox.danwin1210.de -canonical_maps = inline:{{@mail2tor.onion=@mail2tor.com}, {@torbox3uiot6wchz.onion=@torbox36ijlcevujx7mjb4oiusvwgvmue7jfn2cvutwa6kl6to3uyqad.onion}, {@torbox.onion=@torbox36ijlcevujx7mjb4oiusvwgvmue7jfn2cvutwa6kl6to3uyqad.onion}, {@torbox.danwin1210.me=@torbox36ijlcevujx7mjb4oiusvwgvmue7jfn2cvutwa6kl6to3uyqad.onion}, {@torbox.danwin1210.de=@torbox36ijlcevujx7mjb4oiusvwgvmue7jfn2cvutwa6kl6to3uyqad.onion}} -sender_canonical_maps = inline:{{@localhost=@danwin1210.de}, {@danielas3rtn54uwmofdo3x2bsdifr47huasnmbgqzfrec5ubupvtpid.onion=@danwin1210.de}, {@danwin1210.me=@danwin1210.de}} -transport_maps = inline:{{torbox3uiot6wchz.onion=relay:[torbox36ijlcevujx7mjb4oiusvwgvmue7jfn2cvutwa6kl6to3uyqad.onion]:25}, {.onion=smtp}, {mail2tor.com=relay:[xc7tgk2c5onxni2wsy76jslfsitxjbbptejnqhw6gy2ft7khpevhc7ad.onion]:25}, {blackhost.xyz=relay:[blackhost7pws76u6vohksdahnm6adf7riukgcmahrwt43wv2drvyxid.onion]:25}} proxy:mysql:/etc/postfix/sql/mysql_transport_maps.cf inline:{*=relay:[10.9.0.1]:1025} +relay_domains = +canonical_maps = inline:{{@mail2tor.onion=@mail2tor.com}, {@torbox3uiot6wchz.onion=@torbox36ijlcevujx7mjb4oiusvwgvmue7jfn2cvutwa6kl6to3uyqad.onion}, {@torbox.onion=@torbox36ijlcevujx7mjb4oiusvwgvmue7jfn2cvutwa6kl6to3uyqad.onion}} +sender_canonical_maps = inline:{{@localhost=@danwin1210.de}, {@danielas3rtn54uwmofdo3x2bsdifr47huasnmbgqzfrec5ubupvtpid.onion=@danwin1210.de}} +transport_maps = inline:{{.onion=smtp}, {mail2tor.com=relay:[xc7tgk2c5onxni2wsy76jslfsitxjbbptejnqhw6gy2ft7khpevhc7ad.onion]:25}, {blackhost.xyz=relay:[blackhost7pws76u6vohksdahnm6adf7riukgcmahrwt43wv2drvyxid.onion]:25}} proxy:mysql:/etc/postfix/sql/mysql_transport_maps.cf inline:{*=relay:[10.9.0.1]:1025} virtual_alias_maps = proxy:mysql:/etc/postfix/sql/mysql_virtual_alias_maps.cf virtual_mailbox_domains = proxy:mysql:/etc/postfix/sql/mysql_virtual_domains_maps.cf virtual_mailbox_maps = proxy:mysql:/etc/postfix/sql/mysql_virtual_mailbox_maps.cf diff --git a/usr/local/etc/rspamd/local.d/actions.conf b/etc/rspamd/local.d/actions.conf similarity index 100% rename from usr/local/etc/rspamd/local.d/actions.conf rename to etc/rspamd/local.d/actions.conf diff --git a/usr/local/etc/rspamd/local.d/antivirus.conf b/etc/rspamd/local.d/antivirus.conf similarity index 100% rename from usr/local/etc/rspamd/local.d/antivirus.conf rename to etc/rspamd/local.d/antivirus.conf diff --git a/usr/local/etc/rspamd/local.d/arc.conf b/etc/rspamd/local.d/arc.conf similarity index 59% rename from usr/local/etc/rspamd/local.d/arc.conf rename to etc/rspamd/local.d/arc.conf index 0887ee7..cf59e56 100644 --- a/usr/local/etc/rspamd/local.d/arc.conf +++ b/etc/rspamd/local.d/arc.conf @@ -4,11 +4,11 @@ domain { danwin1210.de { selectors [ { - path: "/usr/local/etc/rspamd/dkim_keys/danwin1210.de-rsa"; + path: "/var/lib/rspamd/dkim/danwin1210.de-rsa"; selector: "20211204-rsa"; }, { - path: "/usr/local/etc/rspamd/dkim_keys/danwin1210.de-ed25519"; + path: "/var/lib/rspamd/dkim/danwin1210.de-ed25519"; selector: "20211204-ed25519"; } ] diff --git a/usr/local/etc/rspamd/local.d/classifier-bayes.conf b/etc/rspamd/local.d/classifier-bayes.conf similarity index 100% rename from usr/local/etc/rspamd/local.d/classifier-bayes.conf rename to etc/rspamd/local.d/classifier-bayes.conf diff --git a/usr/local/etc/rspamd/local.d/dkim_signing.conf b/etc/rspamd/local.d/dkim_signing.conf similarity index 70% rename from usr/local/etc/rspamd/local.d/dkim_signing.conf rename to etc/rspamd/local.d/dkim_signing.conf index ce4020b..0d68dd1 100644 --- a/usr/local/etc/rspamd/local.d/dkim_signing.conf +++ b/etc/rspamd/local.d/dkim_signing.conf @@ -8,11 +8,11 @@ domain { danwin1210.de { selectors [ { - path: "/usr/local/etc/rspamd/dkim_keys/danwin1210.de-rsa"; + path: "/var/lib/rspamd/dkim/danwin1210.de-rsa"; selector: "20211204-rsa"; }, { - path: "/usr/local/etc/rspamd/dkim_keys/danwin1210.de-ed25519"; + path: "/var/lib/rspamd/dkim/danwin1210.de-ed25519"; selector: "20211204-ed25519"; } ] diff --git a/usr/local/etc/rspamd/local.d/greylist.conf b/etc/rspamd/local.d/greylist.conf similarity index 100% rename from usr/local/etc/rspamd/local.d/greylist.conf rename to etc/rspamd/local.d/greylist.conf diff --git a/usr/local/etc/rspamd/local.d/groups.conf b/etc/rspamd/local.d/groups.conf similarity index 100% rename from usr/local/etc/rspamd/local.d/groups.conf rename to etc/rspamd/local.d/groups.conf diff --git a/usr/local/etc/rspamd/local.d/logging.inc b/etc/rspamd/local.d/logging.inc similarity index 100% rename from usr/local/etc/rspamd/local.d/logging.inc rename to etc/rspamd/local.d/logging.inc diff --git a/usr/local/etc/rspamd/local.d/options.inc b/etc/rspamd/local.d/options.inc similarity index 100% rename from usr/local/etc/rspamd/local.d/options.inc rename to etc/rspamd/local.d/options.inc diff --git a/usr/local/etc/rspamd/local.d/phishing.conf b/etc/rspamd/local.d/phishing.conf similarity index 100% rename from usr/local/etc/rspamd/local.d/phishing.conf rename to etc/rspamd/local.d/phishing.conf diff --git a/usr/local/etc/rspamd/local.d/ratelimit.conf b/etc/rspamd/local.d/ratelimit.conf similarity index 100% rename from usr/local/etc/rspamd/local.d/ratelimit.conf rename to etc/rspamd/local.d/ratelimit.conf diff --git a/usr/local/etc/rspamd/local.d/redis.conf b/etc/rspamd/local.d/redis.conf similarity index 100% rename from usr/local/etc/rspamd/local.d/redis.conf rename to etc/rspamd/local.d/redis.conf diff --git a/usr/local/etc/rspamd/local.d/statistics_group.conf b/etc/rspamd/local.d/statistics_group.conf similarity index 100% rename from usr/local/etc/rspamd/local.d/statistics_group.conf rename to etc/rspamd/local.d/statistics_group.conf diff --git a/usr/local/etc/rspamd/local.d/worker-fuzzy.inc b/etc/rspamd/local.d/worker-fuzzy.inc similarity index 100% rename from usr/local/etc/rspamd/local.d/worker-fuzzy.inc rename to etc/rspamd/local.d/worker-fuzzy.inc diff --git a/usr/local/etc/rspamd/local.d/worker-proxy.inc b/etc/rspamd/local.d/worker-proxy.inc similarity index 100% rename from usr/local/etc/rspamd/local.d/worker-proxy.inc rename to etc/rspamd/local.d/worker-proxy.inc diff --git a/usr/local/etc/rspamd/lua/rspamd.local.lua b/etc/rspamd/lua/rspamd.local.lua similarity index 100% rename from usr/local/etc/rspamd/lua/rspamd.local.lua rename to etc/rspamd/lua/rspamd.local.lua diff --git a/usr/local/etc/rspamd/override.d/fuzzy_check.conf b/etc/rspamd/override.d/fuzzy_check.conf similarity index 100% rename from usr/local/etc/rspamd/override.d/fuzzy_check.conf rename to etc/rspamd/override.d/fuzzy_check.conf diff --git a/usr/local/etc/rspamd/override.d/worker-controller.inc b/etc/rspamd/override.d/worker-controller.inc similarity index 100% rename from usr/local/etc/rspamd/override.d/worker-controller.inc rename to etc/rspamd/override.d/worker-controller.inc diff --git a/install_binaries.sh b/install_binaries.sh index 50d0bd2..7385b92 100755 --- a/install_binaries.sh +++ b/install_binaries.sh @@ -29,7 +29,7 @@ if [ ! -e /etc/dovecot/ecprivkey.pem ]; then fi # postifx certificates if [ ! -e /etc/postfix/danwin1210-mail.chain ]; then - openssl req -x509 -nodes -days 3650 -newkey ed448 -keyout /etc/postfix/danwin121-mail.key -out /etc/postfix/danwin1210-mail.crt && cat /etc/postfix/danwin1210-mail.key >> /etc/postfix/danwin1210-mail.chain && cat /etc/postfix/danwin1210-mail.crt >> /etc/postfix/danwin1210-mail.chain + openssl req -x509 -nodes -days 3650 -newkey ed448 -subj "/" -keyout /etc/postfix/danwin121-mail.key -out /etc/postfix/danwin1210-mail.crt && cat /etc/postfix/danwin1210-mail.key >> /etc/postfix/danwin1210-mail.chain && cat /etc/postfix/danwin1210-mail.crt >> /etc/postfix/danwin1210-mail.chain fi #install scripts