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 /flakes/private | |
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 'flakes/private')
-rw-r--r-- | flakes/private/openarc/flake.lock | 2 | ||||
-rw-r--r-- | flakes/private/opendmarc/flake.lock | 2 | ||||
-rw-r--r-- | flakes/private/opendmarc/flake.nix | 9 |
3 files changed, 6 insertions, 7 deletions
diff --git a/flakes/private/openarc/flake.lock b/flakes/private/openarc/flake.lock index 744d002..be75993 100644 --- a/flakes/private/openarc/flake.lock +++ b/flakes/private/openarc/flake.lock | |||
@@ -146,7 +146,7 @@ | |||
146 | }, | 146 | }, |
147 | "secrets": { | 147 | "secrets": { |
148 | "locked": { | 148 | "locked": { |
149 | "narHash": "sha256-aRHKDVHDpnqpmgGhLGQxXwyTwmPuhUJTVcOLBYtY2ks=", | 149 | "narHash": "sha256-w3u1bMEJHCg9SqErJ5Qi0sTX2xx7mk+HrHZXzpjQd1w=", |
150 | "path": "../../secrets", | 150 | "path": "../../secrets", |
151 | "type": "path" | 151 | "type": "path" |
152 | }, | 152 | }, |
diff --git a/flakes/private/opendmarc/flake.lock b/flakes/private/opendmarc/flake.lock index bd5019c..f40e1a9 100644 --- a/flakes/private/opendmarc/flake.lock +++ b/flakes/private/opendmarc/flake.lock | |||
@@ -129,7 +129,7 @@ | |||
129 | }, | 129 | }, |
130 | "secrets": { | 130 | "secrets": { |
131 | "locked": { | 131 | "locked": { |
132 | "narHash": "sha256-aRHKDVHDpnqpmgGhLGQxXwyTwmPuhUJTVcOLBYtY2ks=", | 132 | "narHash": "sha256-w3u1bMEJHCg9SqErJ5Qi0sTX2xx7mk+HrHZXzpjQd1w=", |
133 | "path": "../../secrets", | 133 | "path": "../../secrets", |
134 | "type": "path" | 134 | "type": "path" |
135 | }, | 135 | }, |
diff --git a/flakes/private/opendmarc/flake.nix b/flakes/private/opendmarc/flake.nix index 2b73070..e2575e7 100644 --- a/flakes/private/opendmarc/flake.nix +++ b/flakes/private/opendmarc/flake.nix | |||
@@ -53,9 +53,8 @@ | |||
53 | config.secrets.fullPaths."opendmarc/ignore.hosts" | 53 | config.secrets.fullPaths."opendmarc/ignore.hosts" |
54 | ]; | 54 | ]; |
55 | }; | 55 | }; |
56 | secrets.keys = [ | 56 | secrets.keys = { |
57 | { | 57 | "opendmarc/ignore.hosts" = { |
58 | dest = "opendmarc/ignore.hosts"; | ||
59 | user = config.services.opendmarc.user; | 58 | user = config.services.opendmarc.user; |
60 | group = config.services.opendmarc.group; | 59 | group = config.services.opendmarc.group; |
61 | permissions = "0400"; | 60 | permissions = "0400"; |
@@ -67,8 +66,8 @@ | |||
67 | builtins.concatStringsSep "\n" ([ | 66 | builtins.concatStringsSep "\n" ([ |
68 | config.myEnv.mail.dmarc.ignore_hosts | 67 | config.myEnv.mail.dmarc.ignore_hosts |
69 | ] ++ lib.mapAttrsToList (n: v: v.fqdn) mxes); | 68 | ] ++ lib.mapAttrsToList (n: v: v.fqdn) mxes); |
70 | } | 69 | }; |
71 | ]; | 70 | }; |
72 | }; | 71 | }; |
73 | }; | 72 | }; |
74 | in | 73 | in |