raphael/nixos
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(self_host/mail): restore the connection to mailjet

Browse source
This commit is contained in:
Raphael 2025-12-25 01:27:31 +01:00
parent 997042d9be
commit b9ed7f1eb8
No known key found for this signature in database
1 changed files with 44 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

18
services/self_host/mail.nix
View file

@ -77,11 +77,6 @@ in
smtpd_tls_cert_file = "/var/lib/acme/mail.enium.eu/fullchain.pem"; smtpd_tls_cert_file = "/var/lib/acme/mail.enium.eu/fullchain.pem";
smtpd_tls_key_file = "/var/lib/acme/mail.enium.eu/key.pem"; smtpd_tls_key_file = "/var/lib/acme/mail.enium.eu/key.pem";
smtpd_milters = "unix:/run/rspamd/rspamd.sock";
non_smtpd_milters = "unix:/run/rspamd/rspamd.sock";
milter_protocol = "6";
milter_default_action = "accept";
milter_mail_macros = "i {mail_addr} {client_addr} {client_name} {auth_authen}";
}; };
master."submission" = { master."submission" = {
type = "inet"; type = "inet";
@ -107,7 +102,7 @@ in
systemd.services.postfix.preStart = lib.mkMerge [ systemd.services.postfix.preStart = lib.mkMerge [
(lib.mkAfter '' (lib.mkAfter ''
umask 077 umask 077
echo "[in-v3.mailjet.com]:587 $(cat ${mailjet-pass}):$(cat ${mailjet-pass})" > /var/lib/postfix/sasl_passwd echo "[in-v3.mailjet.com]:587 $(cat ${mailjet-user}):$(cat ${mailjet-pass})" > /var/lib/postfix/sasl_passwd
chown postfix:postfix /var/lib/postfix/sasl_passwd chown postfix:postfix /var/lib/postfix/sasl_passwd
chmod 600 /var/lib/postfix/sasl_passwd chmod 600 /var/lib/postfix/sasl_passwd
${pkgs.postfix}/bin/postmap /var/lib/postfix/sasl_passwd ${pkgs.postfix}/bin/postmap /var/lib/postfix/sasl_passwd
@ -143,7 +138,7 @@ in
extraConfig = '' extraConfig = ''
protocols = imap lmtp protocols = imap lmtp
auth_mechanisms = plain login auth_mechanisms = plain login
disable_plaintext_auth = yes disable_plaintext_auth = no
base_dir = /run/dovecot base_dir = /run/dovecot
userdb { userdb {
@ -240,6 +235,7 @@ in
services.rspamd = { services.rspamd = {
enable = true; enable = true;
postfix.enable = true;
extraConfig = '' extraConfig = ''
worker "controller" { worker "controller" {
bind_socket = "127.0.0.1:11334"; bind_socket = "127.0.0.1:11334";
@ -265,13 +261,6 @@ in
greylist = 4; greylist = 4;
}; };
milter {
unix_socket = "/run/rspamd/milter.sock";
unix_permissions = 0660;
user = "rspamd";
group = "postfix";
};
classifier "bayes" { classifier "bayes" {
backend = "redis"; backend = "redis";
servers = "127.0.0.1:6381"; servers = "127.0.0.1:6381";
@ -318,6 +307,7 @@ EOD;
}; };
security.acme.certs."mail.enium.eu" = { security.acme.certs."mail.enium.eu" = {
listenHTTP = ":80"; listenHTTP = ":80";
group = "dovecot2";
}; };
}; };
} }