diff options
author | Ismaël Bouya <ismael.bouya@normalesup.org> | 2021-10-16 17:40:07 +0200 |
---|---|---|
committer | Ismaël Bouya <ismael.bouya@normalesup.org> | 2021-10-16 20:20:45 +0200 |
commit | 4c4652aabf2cb3ac8b40f2856eca07a1df9c27e0 (patch) | |
tree | 9a7ede9ac3f1899074e9ef568a447f883191d3b5 /modules/private/mail/milters.nix | |
parent | da30ae4ffdd153a1eb32fb86f9ca9a65aa19e4e2 (diff) | |
download | Nix-4c4652aabf2cb3ac8b40f2856eca07a1df9c27e0.tar.gz Nix-4c4652aabf2cb3ac8b40f2856eca07a1df9c27e0.tar.zst Nix-4c4652aabf2cb3ac8b40f2856eca07a1df9c27e0.zip |
Use attrs for secrets instead of lists
Diffstat (limited to 'modules/private/mail/milters.nix')
-rw-r--r-- | modules/private/mail/milters.nix | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/modules/private/mail/milters.nix b/modules/private/mail/milters.nix index 172e216..4b93a7a 100644 --- a/modules/private/mail/milters.nix +++ b/modules/private/mail/milters.nix | |||
@@ -17,30 +17,27 @@ | |||
17 | ''; | 17 | ''; |
18 | }; | 18 | }; |
19 | config = lib.mkIf (config.myServices.mail.enable || config.myServices.mailBackup.enable) { | 19 | config = lib.mkIf (config.myServices.mail.enable || config.myServices.mailBackup.enable) { |
20 | secrets.keys = [ | 20 | secrets.keys = { |
21 | { | 21 | "opendkim" = { |
22 | dest = "opendkim"; | ||
23 | isDir = true; | 22 | isDir = true; |
24 | user = config.services.opendkim.user; | 23 | user = config.services.opendkim.user; |
25 | group = config.services.opendkim.group; | 24 | group = config.services.opendkim.group; |
26 | permissions = "0550"; | 25 | permissions = "0550"; |
27 | } | 26 | }; |
28 | { | 27 | "opendkim/eldiron.private" = { |
29 | dest = "opendkim/eldiron.private"; | ||
30 | user = config.services.opendkim.user; | 28 | user = config.services.opendkim.user; |
31 | group = config.services.opendkim.group; | 29 | group = config.services.opendkim.group; |
32 | permissions = "0400"; | 30 | permissions = "0400"; |
33 | text = config.myEnv.mail.dkim.eldiron.private; | 31 | text = config.myEnv.mail.dkim.eldiron.private; |
34 | } | 32 | }; |
35 | { | 33 | "opendkim/eldiron.txt" = { |
36 | dest = "opendkim/eldiron.txt"; | ||
37 | user = config.services.opendkim.user; | 34 | user = config.services.opendkim.user; |
38 | group = config.services.opendkim.group; | 35 | group = config.services.opendkim.group; |
39 | permissions = "0444"; | 36 | permissions = "0444"; |
40 | text = '' | 37 | text = '' |
41 | eldiron._domainkey IN TXT ${config.myEnv.mail.dkim.eldiron.public}''; | 38 | eldiron._domainkey IN TXT ${config.myEnv.mail.dkim.eldiron.public}''; |
42 | } | 39 | }; |
43 | ]; | 40 | }; |
44 | users.users."${config.services.opendkim.user}".extraGroups = [ "keys" ]; | 41 | users.users."${config.services.opendkim.user}".extraGroups = [ "keys" ]; |
45 | services.opendkim = { | 42 | services.opendkim = { |
46 | enable = true; | 43 | enable = true; |