Compare commits

...

3 Commits

8 changed files with 30 additions and 19 deletions

View File

@ -3,7 +3,7 @@
. ../APKBUILD-config.template
pkgver=2023.07.05.03
pkgver=2023.10.30.01
pkgrel=0
depends="postfix-pgsql redxen-secret-letsencrypt-chain redxen-secret-letsencrypt-private"
@ -42,7 +42,7 @@ package() {
sha512sums="
1cb4072b03f3e9d79b15a082ccad99fc005129b56fc42c467713520f89feef298082637fbfaa01a04c2a1b6e69a254d9018adccaf9d98a4532f067214a4035f4 master.cf
85629086e3a5daa664fbe33268e460d73a02e8ec889983383352e78fe2eac2ca5a749e03ca4e3eb65427cffd11f4834ac8ff6aa783e8ac117b46d3d18cbcf0d9 main.cf
a47f017c48446161f2a460d00aefa8f25332f2e7ab2ddc435a2f1ae37642c4abcae170532e92defa16ccb050ffbd21fd073b7c42b84d212a0c1fbd0e507d88fd main.cf
e2e2073b064a921a9eeed028e17617bcd2d1235517d908b4daadef45eb4cbb8686023c532d7938a779021cdd9548afe97f59d4c3232e7e01dca229e37e8c63ff secret
51595b478be5cb66c9cb92963ba82f3851a5e912a1c427330ebd1a5abedd3e763467448e83f5c58f08dc51e70d420d0db6026eccc9955e3bb58f52f3773a4c85 pgsql-aliases.cf
df25ccb7d6d27fba0cf4c75b440b81fc80e006583ff56f7a78fb8ddc361a4e63a0d80e92ccaf34d72e59a7b3babf8ca893c7b055ae0f9d75c04fc9b40dd00608 pgsql-users.cf

View File

@ -16,11 +16,10 @@ mynetworks = 127.0.0.0/8 [::ffff:127.0.0.0]/104 [::1]/128
relayhost =
relay_domains = $mydestination
virtual_alias_domains = mail.ripped-condoms.$myorigin
virtual_alias_maps = inline:{@mail.ripped-condoms.$myorigin=caskd}
virtual_alias_domains = $myorigin, mail.ripped-condoms.$myorigin
virtual_alias_maps = proxy:pgsql:/etc/redxen/postfix/pgsql-aliases.cf, inline:{@mail.ripped-condoms.$myorigin=caskd}
local_transport = local
alias_maps = proxy:pgsql:/etc/redxen/postfix/pgsql-aliases.cf
local_transport = lmtp:unix:/run/dovecot/lmtp
smtpd_sender_login_maps = proxy:pgsql:/etc/redxen/postfix/pgsql-users.cf
local_recipient_maps = $smtpd_sender_login_maps $alias_maps
@ -67,9 +66,6 @@ smtpd_sasl_path = /run/dovecot/auth
smtpd_sasl_security_options = noanonymous
smtpd_sasl_local_domain = $myorigin
# Dovecot LMTP
mailbox_transport = lmtp:unix:/run/dovecot/lmtp
# OpenDKIM & RSpamD
milter_protocol = 6
milter_default_action = tempfail
@ -77,3 +73,8 @@ internal_mail_filter_classes =
smtpd_milters = inet:rspamd.routinginfo.internal:7510 $non_smtpd_milters
non_smtpd_milters = inet:opendkim.routinginfo.internal:7514
# Caching
address_verify_negative_cache = yes
address_verify_negative_expire_time = 1d
address_verify_negative_refresh_time = 5m

View File

@ -3,7 +3,7 @@
. ../APKBUILD-config.template
pkgver=2023.04.19.02
pkgver=2023.10.31.03
pkgrel=0
_baseconf="
rspamd.conf
@ -82,7 +82,7 @@ _module() {
}
sha512sums="
746cc011411f0173e109c19ebb578cb7031a858b38ff6e1800876eef49487be3600ec9747c0c0aaa89d603587caaf227ee5da44556b57bb067f651aa5947a315 rspamd.conf
4a712dc9c5893eaf80ce9887901e5788d225f54c9d9db592d0b2b8ee32d73f91f4d6c201f5922e4400e55323ae3c2a167463848989d1c169b9685fb1b859c220 rspamd.conf
e01ab4f8c4806692f295c2a8ea18828a9df6a011c2e57d6020a325bfd23a3b2d933f8ecc0ab4c49cebf931718aecb58cf288852a036bd828d9da79ebc132ed14 composites.conf
99d6b2b173ac5b62977562bb3f2d04cf29d3d94329a4b2abc120e6cca6da79d5ac2a35a16832f62b8e1fed331b6724f21b5e1aab076bd3c57b28b2261302238a logging.conf
e40a35928fe429c98301a4fd25d6fb71801ad0a78fa244423726df0bf069950756c77a1d03c77b8dcdae8eda27d3dd95ab67964fad005b90547fafb12718c28d statistic.conf

View File

@ -1,5 +1,9 @@
force_actions {
rules {
FA_SPAMTRAP {
expression = "SPAMTRAP";
action = "discard";
}
FA_INVALID_DATE {
expression = "INVALID_DATE";
action = "reject";

View File

@ -9,5 +9,4 @@ spamtrap {
fuzzy_weight = 10.0;
check_authed = false;
check_local = false;
action = "reject";
}

View File

@ -12,7 +12,7 @@ modules {
options {
pidfile = "$RUNDIR/rspamd.pid";
filters = "ratelimit,mx_check,dkim,spf,arc,dmarc,maillist,fuzzy_check,chartable,phishing,rbl,hfilter,forged_recipients,redis,force_actions,milter_headers";
filters = "spamtrap,ratelimit,mx_check,dkim,spf,arc,dmarc,maillist,fuzzy_check,chartable,phishing,rbl,hfilter,forged_recipients,redis,force_actions,milter_headers";
raw_mode = false;
one_shot = false;
map_watch_interval = 5min;
@ -71,4 +71,8 @@ options {
actions {
add_header = 2;
discard = {
flags = ["no_threshold"],
discard_on_reject = true
}
}

View File

@ -3,7 +3,7 @@
. ../APKBUILD-config.template
pkgver=2022.09.27.01
pkgver=2023.12.27.01
pkgrel=0
source="
secret
@ -30,5 +30,5 @@ package() {
sha512sums="
7435cdea2f9a63d09164c6c7cf6105e24a27316150bbebb7c2abda0a72c9ffcbd36632be1f9d77bccdc616fa8b84a9bfeaa4b5b32349d11a3d4f9c12ee884963 secret
3581c24c08a1c5f2653759ca79014096423425e0ffbe7e7ba6c854ef102a33f5f14b8781dff4820814303321ecafe8c8c2667c80eb16d58621ddf4dcf51531a5 settings.json
577c9dbcd6d80f975ea82d88b018489016c83e7b2bff87539661ee7cf5c41c0de7edea8b847d6f74c7f5d4bf878b2786464d23cad60fd85e1617776468827a1f settings.json
"

View File

@ -32,14 +32,17 @@
"download-dir": "/seedbox",
"watch-dir-enabled": false,
"trash-original-torrent-files": false,
"trash-can-enable": false,
"ratio-limit-enabled": false,
"idle-seeding-limit-enabled": false,
"upload-slots-per-torrent": 100,
"download-queue-enabled": false,
"queue-stalled-enabled": false,
"seed-queue-enabled": false,
"download-queue-enabled": true,
"download-queue-size": 100,
"queue-stalled-enabled": true,
"seed-queue-enabled": true,
"seed-queue-size": 100,
"bind-address-ipv4": "0.0.0.0",
"bind-address-ipv6": "::",
@ -53,7 +56,7 @@
"peer-socket-tos": "throughput",
"prefetch-enabled": true,
"cache-size-mb": 50,
"cache-size-mb": 0,
"lazy-bitfield-enabled": false
}