aboutsummaryrefslogtreecommitdiff
path: root/modules/private/mail/milters.nix
diff options
context:
space:
mode:
Diffstat (limited to 'modules/private/mail/milters.nix')
-rw-r--r--modules/private/mail/milters.nix4
1 files changed, 4 insertions, 0 deletions
diff --git a/modules/private/mail/milters.nix b/modules/private/mail/milters.nix
index 5de03cf..02c35c8 100644
--- a/modules/private/mail/milters.nix
+++ b/modules/private/mail/milters.nix
@@ -64,6 +64,7 @@
64 ''; 64 '';
65 group = config.services.postfix.group; 65 group = config.services.postfix.group;
66 }; 66 };
67 systemd.services.opendkim.serviceConfig.Slice = "mail.slice";
67 systemd.services.opendkim.preStart = lib.mkBefore '' 68 systemd.services.opendkim.preStart = lib.mkBefore ''
68 # Skip the prestart script as keys are handled in secrets 69 # Skip the prestart script as keys are handled in secrets
69 exit 0 70 exit 0
@@ -76,6 +77,7 @@
76 }; 77 };
77 78
78 users.users."${config.services.opendmarc.user}".extraGroups = [ "keys" ]; 79 users.users."${config.services.opendmarc.user}".extraGroups = [ "keys" ];
80 systemd.services.opendmarc.serviceConfig.Slice = "mail.slice";
79 services.opendmarc = { 81 services.opendmarc = {
80 enable = true; 82 enable = true;
81 socket = "local:${config.myServices.mail.milters.sockets.opendmarc}"; 83 socket = "local:${config.myServices.mail.milters.sockets.opendmarc}";
@@ -116,6 +118,7 @@
116 Syslog Yes 118 Syslog Yes
117 ''; 119 '';
118 }; 120 };
121 systemd.services.openarc.serviceConfig.Slice = "mail.slice";
119 systemd.services.openarc.postStart = lib.optionalString 122 systemd.services.openarc.postStart = lib.optionalString
120 (lib.strings.hasPrefix "local:" config.services.openarc.socket) '' 123 (lib.strings.hasPrefix "local:" config.services.openarc.socket) ''
121 while [ ! -S ${lib.strings.removePrefix "local:" config.services.openarc.socket} ]; do 124 while [ ! -S ${lib.strings.removePrefix "local:" config.services.openarc.socket} ]; do
@@ -136,6 +139,7 @@
136 wantedBy = [ "multi-user.target" ]; 139 wantedBy = [ "multi-user.target" ];
137 140
138 serviceConfig = { 141 serviceConfig = {
142 Slice = "mail.slice";
139 User = "postfix"; 143 User = "postfix";
140 Group = "postfix"; 144 Group = "postfix";
141 ExecStart = let python = pkgs.python3.withPackages (p: [ p.pymilter ]); 145 ExecStart = let python = pkgs.python3.withPackages (p: [ p.pymilter ]);