diff options
Diffstat (limited to 'modules/private/system/quatresaisons')
-rw-r--r-- | modules/private/system/quatresaisons/databases.nix | 14 |
1 files changed, 6 insertions, 8 deletions
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 @@ | |||
9 | services.postgresql.ensureUsers = [ | 9 | services.postgresql.ensureUsers = [ |
10 | { name = "naemon"; } | 10 | { name = "naemon"; } |
11 | ]; | 11 | ]; |
12 | secrets.keys = [ | 12 | secrets.keys = { |
13 | { | 13 | "ldap/password" = { |
14 | dest = "ldap/password"; | ||
15 | permissions = "0400"; | 14 | permissions = "0400"; |
16 | user = "openldap"; | 15 | user = "openldap"; |
17 | group = "openldap"; | 16 | group = "openldap"; |
18 | text = "rootpw ${serverSpecificConfig.ldap_root_pw}"; | 17 | text = "rootpw ${serverSpecificConfig.ldap_root_pw}"; |
19 | } | 18 | }; |
20 | { | 19 | "webapps/tools-ldap" = { |
21 | dest = "webapps/tools-ldap"; | ||
22 | user = "wwwrun"; | 20 | user = "wwwrun"; |
23 | group = "wwwrun"; | 21 | group = "wwwrun"; |
24 | permissions = "0400"; | 22 | permissions = "0400"; |
@@ -42,8 +40,8 @@ | |||
42 | $servers->setValue('login','attr','uid'); | 40 | $servers->setValue('login','attr','uid'); |
43 | $servers->setValue('login','fallback_dn',true); | 41 | $servers->setValue('login','fallback_dn',true); |
44 | ''; | 42 | ''; |
45 | } | 43 | }; |
46 | ]; | 44 | }; |
47 | 45 | ||
48 | users.users.openldap.extraGroups = [ "keys" ]; | 46 | users.users.openldap.extraGroups = [ "keys" ]; |
49 | services.openldap = { | 47 | services.openldap = { |