Add back sieve functionality and fix opendkim dns record

This commit is contained in:
Alex D. 2021-01-13 20:51:54 +00:00
parent d2aa73b87a
commit 5777b0c6bb
Signed by: caskd
GPG Key ID: F92BA85F61F4C173
6 changed files with 25 additions and 28 deletions

View File

@ -2,12 +2,12 @@
# Maintainer: Alex Denes <caskd@redxen.eu>
pkgname=redxen-config-dovecot
pkgver=2021.01.13
pkgrel=1
pkgrel=3
pkgdesc="Dovecot configuration"
url="https://git.redxen.eu/RedXen"
arch="noarch"
license="none"
depends="dovecot dovecot-lmtpd dovecot-pgsql redxen-secret-letsencrypt-chain redxen-secret-letsencrypt-private"
depends="dovecot dovecot-lmtpd dovecot-pgsql dovecot-pigeonhole-plugin redxen-secret-letsencrypt-chain redxen-secret-letsencrypt-private"
install="$pkgname.pre-install"
source="
dovecot.conf
@ -23,6 +23,6 @@ package() {
install -d "$pkgdir"/var/mail
}
sha512sums="b96eab7f066bf1a1baa729cba152f3190a5179e6c3940c9b28dbbdc2439052d7983f9e79d22675fc84420fb4a932dcfdb589547b77391ae27ec26cb4e6d60405 dovecot.conf
sha512sums="12b9bccf6c9578c9608bf2faeba04c4a3660b3932a84d703902446ae5aeee50ac43064bbc8ec640953ab2ec8af2a786098e0e0e6168f56fad700ed9286fb1485 dovecot.conf
d4646d31915b6fc0df7cc9c06d66c369f6a622f2f0c783fd9463a05a53d1b3b3ba2ebcbe32b2391f0e44fe2a67c6eeeef3b00d3067325152054e184ac67ff745 pgsql.conf
e305a5ee8196f09d805278acf27a2b66eae9c9e3c6e3458bca391597b1c720c063f8c92034d1af070c750fd0858da7eaa16e75a3b060064eac6b5bcb7b2452e7 rspamd.sieve"

View File

@ -96,21 +96,18 @@ namespace inbox {
}
}
#protocol lmtp {
# mail_plugins = $mail_plugins sieve
#}
#plugin {
# sieve_plugins = sieve_extprograms
# sieve_extensions = +editheader +mboxmetadata +servermetadata +imapflags +notify +spamtest +spamtestplus +virustest
#
# sieve_spamtest_status_type = score
# sieve_spamtest_status_header = X-Spamd-Result: .*? \[([[:digit:]]+\.[[:digit:]]+) / [[:digit:]]+\.[[:digit:]]+\];
# sieve_spamtest_max_value = 6
# sieve_spamtest_max_header = X-Spamd-Result: .*? \[[[:digit:]]+\.[[:digit:]]+ / ([[:digit:]]+\.[[:digit:]]+)\];
#
# sieve_spamtest_status_type = text
# sieve_spamtest_status_header = X-Spam
# sieve_spamtest_text_value1 = No
# sieve_spamtest_text_value10 = Yes
# sieve_default = /etc/dovecot/redxen/rspamd.sieve
#}
protocol lmtp {
mail_plugins = $mail_plugins sieve
}
plugin {
sieve_plugins = sieve_extprograms
sieve_extensions = +editheader +mboxmetadata +servermetadata +imapflags +notify +spamtest +spamtestplus +virustest
sieve_spamtest_status_type = score
sieve_spamtest_status_header = X-Spamd-Result: .*? \[([[:digit:]]+\.[[:digit:]]+) / [[:digit:]]+\.[[:digit:]]+\];
sieve_spamtest_status_type = text
sieve_spamtest_status_header = X-Spam
sieve_spamtest_text_value1 = No
sieve_spamtest_text_value10 = Yes
sieve_default = /etc/dovecot/redxen/rspamd.sieve
}

View File

@ -2,7 +2,7 @@
# Maintainer: Alex Denes <caskd@redxen.eu>
pkgname=redxen-config-rspamd
pkgver=2021.01.13
pkgrel=2
pkgrel=4
pkgdesc="RSpamD configuration"
url="https://git.redxen.eu/RedXen"
arch="noarch"
@ -58,7 +58,7 @@ sha512sums="99985993e5d7c525280020e7dc30106b3efbaa8ae2830a5069ad4270a8336d33efca
d42a74d17771497960477878eedda2a00a434cbc1e994b015c21b4f631e24836cb6a7b14a24a2cb42ed15425b7758dc307a6cf602a770cfb0cc20b6f90064af9 redis.conf
a3849ae55a68c90afd913ed18f6b210803f5dbaa2beab5abf23a84b9b4bcb48e617023123724222c1f74a005bf03e1c94e3fa1ded5a6f252d9c2ac317dabc1a2 rbl.conf
6ca83b91e70e43eff6de380065fc5591c6669a27497a47d74e5e096df68afea6269cfad41be982bb144f2dfb92fd5765a600cf9c4067c4612bd1aa1bf5e6ebfd phishing.conf
5a4ecc8ed31bfc0373a272e8a53fe399b6850dc258fba4ad12cdeedd0c9a5cb007b7fe69d66936c85b3be25cdc200232e3939b369a2aec63d767d91a6910e671 milter_headers.conf
932c0dc5ae47ecc470c0a5eb684c5d24f95a75dec09e4ee3e191b0cfa274a4a9e343ed012afeb83d405df802792f9c5a3ad11c73bb933d40210c9e149314c12b milter_headers.conf
08966d0a3c077a12a1113f774e11d51d3c7d04bb45914e295324e8aa51c3d75b55395c256a905c6d9ae1e98a004a9e6b3b37d36fce810a426dd5d90408331c0a maillist.conf
8660fd01589476bbc01bbe75bed392faa55f55fa9b6fea77be79f339cefb43ddbacdbe193ad136c42da91d4ef7f1e1ec40fc5f8f4f398d04bcebf51d5a59ad1f greylist.conf
227f215b4e65bff86428502425f1295b21e0f6e8c4b990e4f19aa8e1bb3f1cee18d1b8644e1223edb606292c786e814acc68d276562c8fb4f23fdce6b538689a fuzzy_check.conf

View File

@ -2,9 +2,9 @@ milter_headers {
skip_local = false;
skip_authenticated = false;
extended_spam_headers = false;
use = ["x-spamd-bar", "authentication-results"];
use = ["x-spamd-result", "authentication-results"];
authenticated_headers = ["authentication-results"];
local_headers = ["x-spamd-bar"];
local_headers = ["x-spamd-result"];
spf_symbols {
pass = "R_SPF_ALLOW";
fail = "R_SPF_FAIL";

View File

@ -2,7 +2,7 @@
# Maintainer: Alex Denes <caskd@redxen.eu>
pkgname=redxen-config-unbound
pkgver=2021.01.13
pkgrel=3
pkgrel=4
pkgdesc="Unbound configurations and some other stuff."
url="https://git.redxen.eu/RedXen"
arch="noarch"
@ -61,6 +61,6 @@ sha512sums="f402b87071a3059992242b7dbce0aaea2f20ec4e5fc4e855160d5ebc75be7dd3d4cb
d3754ced9d8055ff7f1d364a93c403bba3f220a60ea519bceee5e9c43112d6a00d20d15cf659fdd6ad6834cf14afd6ecb5d9e1497ff2932572fd970750655749 base.conf
75709787e0872197c83def93b343550934f6b2e4903873aaf72f357fb8b4a1d7c5b8ba84913f052ad01aeca03f58ca589a22bf867c1c2e40e01f9588c7c580c4 acl.conf
d94ad338e2ea43c3ecdc62c861eddc0bb706807b738dd985309bcdf0b5fb435d7260bf272e2bbe40a774ec5b8fa49cbf23624c2c5213eea94f4f14aa3720abfa rctrl.conf
eaf195c4ed5f75467082b619074292c9f43935adaaa30d591dbbeb3e2bade297c36c933063966416f4eb786ac395f25ef09c518dd490125aa83df1bf966417e7 internal.conf
7288371d91d05930695a448464260e1f849a4294647c1e0969a9889443e314aaa2262c3602786c4a1bd208d6ca63f1ff6e4f697fc066913381f54d9fa843be9d internal.conf
28c917fe7f69643887097553312c4f1ffc747dffdbf150430e6c4b2e5833567922810716cb59a27887915664777ac3263be3c826956f504499f0ebdcc0b3aac5 auth-zones.conf
3d62401e844bed8800cc2a986cbe68c8412d451321f23536c9eddc91b11ca5f2f8525af10398fced05452ce7bd75adcc8327cc4580a4034bbbc3aaf8da52ff65 redxen.eu"

View File

@ -28,7 +28,7 @@ server:
local-data: "redis.routinginfo.redxen.localhost. 86400 IN AAAA 201:5d63:154:f0c6:9789:1899:6acb:1805"
local-data: "influxdb.routinginfo.redxen.localhost. 86400 IN AAAA 201:5d63:154:f0c6:9789:1899:6acb:1805"
local-data: "rspamd.routinginfo.redxen.localhost. 86400 IN AAAA 200:2749:8af:bdf9:f011:997e:7bbb:35f3"
local-data: "opendkim.routinginfo.redxen.localhost. 86400 IN AAAA 200:2749:8af:bdf9:f011:997e:7bbb:35f3"
local-data: "opendkim.routinginfo.redxen.localhost. 86400 IN AAAA 201:3b84:3e03:9e0f:4885:fb55:45f6:ebbd"
# Legacy machines (pre-migration)
local-data: "6051167.nbg1-dc3.hetzner.redxen.localhost. 86400 IN A 10.0.0.4"