diff options
Diffstat (limited to 'modules/private/mail/milters.nix')
-rw-r--r-- | modules/private/mail/milters.nix | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/modules/private/mail/milters.nix b/modules/private/mail/milters.nix index 123af4a..6b033e8 100644 --- a/modules/private/mail/milters.nix +++ b/modules/private/mail/milters.nix | |||
@@ -1,4 +1,4 @@ | |||
1 | { lib, pkgs, config, myconfig, ... }: | 1 | { lib, pkgs, config, ... }: |
2 | { | 2 | { |
3 | options.myServices.mail.milters.sockets = lib.mkOption { | 3 | options.myServices.mail.milters.sockets = lib.mkOption { |
4 | type = lib.types.attrsOf lib.types.path; | 4 | type = lib.types.attrsOf lib.types.path; |
@@ -19,7 +19,7 @@ | |||
19 | user = config.services.opendkim.user; | 19 | user = config.services.opendkim.user; |
20 | group = config.services.opendkim.group; | 20 | group = config.services.opendkim.group; |
21 | permissions = "0400"; | 21 | permissions = "0400"; |
22 | text = myconfig.env.mail.dkim.eldiron.private; | 22 | text = config.myEnv.mail.dkim.eldiron.private; |
23 | } | 23 | } |
24 | { | 24 | { |
25 | dest = "opendkim/eldiron.txt"; | 25 | dest = "opendkim/eldiron.txt"; |
@@ -27,14 +27,14 @@ | |||
27 | group = config.services.opendkim.group; | 27 | group = config.services.opendkim.group; |
28 | permissions = "0444"; | 28 | permissions = "0444"; |
29 | text = '' | 29 | text = '' |
30 | eldiron._domainkey IN TXT ${myconfig.env.mail.dkim.eldiron.public}''; | 30 | eldiron._domainkey IN TXT ${config.myEnv.mail.dkim.eldiron.public}''; |
31 | } | 31 | } |
32 | { | 32 | { |
33 | dest = "opendmarc/ignore.hosts"; | 33 | dest = "opendmarc/ignore.hosts"; |
34 | user = config.services.opendmarc.user; | 34 | user = config.services.opendmarc.user; |
35 | group = config.services.opendmarc.group; | 35 | group = config.services.opendmarc.group; |
36 | permissions = "0400"; | 36 | permissions = "0400"; |
37 | text = myconfig.env.mail.dmarc.ignore_hosts; | 37 | text = config.myEnv.mail.dmarc.ignore_hosts; |
38 | } | 38 | } |
39 | ]; | 39 | ]; |
40 | users.users."${config.services.opendkim.user}".extraGroups = [ "keys" ]; | 40 | users.users."${config.services.opendkim.user}".extraGroups = [ "keys" ]; |
@@ -46,7 +46,7 @@ | |||
46 | (e: "${e.domain}${lib.optionalString (e.domain != "") "."}${zone.name}") | 46 | (e: "${e.domain}${lib.optionalString (e.domain != "") "."}${zone.name}") |
47 | (zone.withEmail or []) | 47 | (zone.withEmail or []) |
48 | ) | 48 | ) |
49 | myconfig.env.dns.masterZones | 49 | config.myEnv.dns.masterZones |
50 | )); | 50 | )); |
51 | keyPath = "${config.secrets.location}/opendkim"; | 51 | keyPath = "${config.secrets.location}/opendkim"; |
52 | selector = "eldiron"; | 52 | selector = "eldiron"; |