commit
08e43cf903
|
@ -43,7 +43,6 @@ in
|
||||||
993 # IMAP
|
993 # IMAP
|
||||||
4190 # sieve
|
4190 # sieve
|
||||||
];
|
];
|
||||||
users.users.postfix.extraGroups = [ "opendkim" ];
|
|
||||||
users.users.rspamd.extraGroups = [ "redis-rspamd" ];
|
users.users.rspamd.extraGroups = [ "redis-rspamd" ];
|
||||||
environment.etc = {
|
environment.etc = {
|
||||||
"dovecot/sieve-pipe/sa-learn-spam.sh" = {
|
"dovecot/sieve-pipe/sa-learn-spam.sh" = {
|
||||||
|
@ -139,8 +138,6 @@ in
|
||||||
alias_maps = [ "hash:/etc/aliases" ];
|
alias_maps = [ "hash:/etc/aliases" ];
|
||||||
alias_database = [ "hash:/etc/aliases" ];
|
alias_database = [ "hash:/etc/aliases" ];
|
||||||
# alias_maps = [ "hash:/etc/aliases" "ldap:${ldap-aliases}" ];
|
# alias_maps = [ "hash:/etc/aliases" "ldap:${ldap-aliases}" ];
|
||||||
smtpd_milters = [ "local:/run/opendkim/opendkim.sock" ];
|
|
||||||
non_smtpd_milters = [ "local:/var/run/opendkim/opendkim.sock" ];
|
|
||||||
smtpd_sasl_auth_enable = true;
|
smtpd_sasl_auth_enable = true;
|
||||||
smtpd_sasl_path = "/var/lib/postfix/auth";
|
smtpd_sasl_path = "/var/lib/postfix/auth";
|
||||||
smtpd_sasl_type = "dovecot";
|
smtpd_sasl_type = "dovecot";
|
||||||
|
@ -274,14 +271,6 @@ in
|
||||||
}
|
}
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
opendkim = {
|
|
||||||
enable = true;
|
|
||||||
domains = "csl:${config.networking.domain}";
|
|
||||||
selector = config.networking.hostName;
|
|
||||||
configFile = pkgs.writeText "opendkim-config" ''
|
|
||||||
UMask 0117
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
rspamd = {
|
rspamd = {
|
||||||
enable = true;
|
enable = true;
|
||||||
postfix.enable = true;
|
postfix.enable = true;
|
||||||
|
|
Loading…
Reference in a new issue