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 --- modules/private/system/quatresaisons/databases.nix | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'modules/private/system/quatresaisons') diff --git a/modules/private/system/quatresaisons/databases.nix b/modules/private/system/quatresaisons/databases.nix index 68ce274..f7b27e0 100644 --- a/modules/private/system/quatresaisons/databases.nix +++ b/modules/private/system/quatresaisons/databases.nix @@ -9,16 +9,14 @@ services.postgresql.ensureUsers = [ { name = "naemon"; } ]; - secrets.keys = [ - { - dest = "ldap/password"; + secrets.keys = { + "ldap/password" = { permissions = "0400"; user = "openldap"; group = "openldap"; text = "rootpw ${serverSpecificConfig.ldap_root_pw}"; - } - { - dest = "webapps/tools-ldap"; + }; + "webapps/tools-ldap" = { user = "wwwrun"; group = "wwwrun"; permissions = "0400"; @@ -42,8 +40,8 @@ $servers->setValue('login','attr','uid'); $servers->setValue('login','fallback_dn',true); ''; - } - ]; + }; + }; users.users.openldap.extraGroups = [ "keys" ]; services.openldap = { -- cgit v1.2.3