mail: restructure

This commit is contained in:
Charlotte Van Petegem 2024-01-29 10:21:30 +01:00
parent b0c95f0d40
commit 58f144d075
No known key found for this signature in database
GPG key ID: 019E764B7184435A

View file

@ -114,27 +114,25 @@ in
dkimKeyDirectory = "${config.chvp.dataPrefix}/var/dkim"; dkimKeyDirectory = "${config.chvp.dataPrefix}/var/dkim";
}; };
services.dovecot2 = { services.dovecot2.sieve = {
sieve = { extensions = [ "+editheader" ];
extensions = [ "+editheader" ]; scripts.after2 = pkgs.writeText "custom-spam.sieve" ''
scripts.after2 = pkgs.writeText "custom-spam.sieve" '' require ["fileinto", "regex"];
require ["fileinto", "regex"];
if anyof(address :is "From" ["junjunggaming07@gmail.com", if anyof(address :is "From" ["junjunggaming07@gmail.com",
"censysnetbackup@gmail.com", "censysnetbackup@gmail.com",
"vitor.carvalheiro@escola.pr.gov.br", "vitor.carvalheiro@escola.pr.gov.br",
"spam@vuztc.ru", "spam@vuztc.ru",
# itsme spam # itsme spam
"noreply.mailing.itsme@online.be", "noreply.mailing.itsme@online.be",
"mailing.itsme@online.be"], "mailing.itsme@online.be"],
# Freshdesk is often used to sent spam from emails like `support@info5813.freshdesk.com` # Freshdesk is often used to sent spam from emails like `support@info5813.freshdesk.com`
address :regex "From" "[a-z\d]+@[a-z\d]+\.freshdesk\.com", address :regex "From" "[a-z\d]+@[a-z\d]+\.freshdesk\.com",
header :contains "From" ["jakubbielec", "Jakub Bielec"]) { header :contains "From" ["jakubbielec", "Jakub Bielec"]) {
fileinto "Junk"; fileinto "Junk";
stop; stop;
} }
''; '';
};
}; };
services.rspamd.extraConfig = '' services.rspamd.extraConfig = ''