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/sympa.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/sympa.nix')
| -rw-r--r-- | modules/private/mail/sympa.nix | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/modules/private/mail/sympa.nix b/modules/private/mail/sympa.nix index 5270b69..920daa9 100644 --- a/modules/private/mail/sympa.nix +++ b/modules/private/mail/sympa.nix | |||
| @@ -34,20 +34,19 @@ in | |||
| 34 | ]; | 34 | ]; |
| 35 | }; | 35 | }; |
| 36 | 36 | ||
| 37 | secrets.keys = [ | 37 | secrets.keys = { |
| 38 | { | 38 | "sympa/db_password" = { |
| 39 | dest = "sympa/db_password"; | ||
| 40 | permissions = "0400"; | 39 | permissions = "0400"; |
| 41 | group = "sympa"; | 40 | group = "sympa"; |
| 42 | user = "sympa"; | 41 | user = "sympa"; |
| 43 | text = sympaConfig.postgresql.password; | 42 | text = sympaConfig.postgresql.password; |
| 44 | } | 43 | }; |
| 45 | ] | 44 | } |
| 46 | ++ lib.mapAttrsToList (n: v: { | 45 | // lib.mapAttrs' (n: v: lib.nameValuePair "sympa/data_sources/${n}.incl" { |
| 47 | dest = "sympa/data_sources/${n}.incl"; permissions = "0400"; group = "sympa"; user = "sympa"; text = v; | 46 | permissions = "0400"; group = "sympa"; user = "sympa"; text = v; |
| 48 | }) sympaConfig.data_sources | 47 | }) sympaConfig.data_sources |
| 49 | ++ lib.mapAttrsToList (n: v: { | 48 | // lib.mapAttrs' (n: v: lib.nameValuePair "sympa/scenari/${n}" { |
| 50 | dest = "sympa/scenari/${n}"; permissions = "0400"; group = "sympa"; user = "sympa"; text = v; | 49 | permissions = "0400"; group = "sympa"; user = "sympa"; text = v; |
| 51 | }) sympaConfig.scenari; | 50 | }) sympaConfig.scenari; |
| 52 | users.users.sympa.extraGroups = [ "keys" ]; | 51 | users.users.sympa.extraGroups = [ "keys" ]; |
| 53 | systemd.slices.mail-sympa = { | 52 | systemd.slices.mail-sympa = { |