From 4c4652aabf2cb3ac8b40f2856eca07a1df9c27e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Isma=C3=ABl=20Bouya?= Date: Sat, 16 Oct 2021 17:40:07 +0200 Subject: Use attrs for secrets instead of lists --- flakes/private/openarc/flake.lock | 2 +- flakes/private/opendmarc/flake.lock | 2 +- flakes/private/opendmarc/flake.nix | 9 ++++----- 3 files changed, 6 insertions(+), 7 deletions(-) (limited to 'flakes/private') 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 @@ }, "secrets": { "locked": { - "narHash": "sha256-aRHKDVHDpnqpmgGhLGQxXwyTwmPuhUJTVcOLBYtY2ks=", + "narHash": "sha256-w3u1bMEJHCg9SqErJ5Qi0sTX2xx7mk+HrHZXzpjQd1w=", "path": "../../secrets", "type": "path" }, 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 @@ }, "secrets": { "locked": { - "narHash": "sha256-aRHKDVHDpnqpmgGhLGQxXwyTwmPuhUJTVcOLBYtY2ks=", + "narHash": "sha256-w3u1bMEJHCg9SqErJ5Qi0sTX2xx7mk+HrHZXzpjQd1w=", "path": "../../secrets", "type": "path" }, 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 @@ config.secrets.fullPaths."opendmarc/ignore.hosts" ]; }; - secrets.keys = [ - { - dest = "opendmarc/ignore.hosts"; + secrets.keys = { + "opendmarc/ignore.hosts" = { user = config.services.opendmarc.user; group = config.services.opendmarc.group; permissions = "0400"; @@ -67,8 +66,8 @@ builtins.concatStringsSep "\n" ([ config.myEnv.mail.dmarc.ignore_hosts ] ++ lib.mapAttrsToList (n: v: v.fqdn) mxes); - } - ]; + }; + }; }; }; in -- cgit v1.2.3