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/websites/tools/dav | |
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/websites/tools/dav')
-rw-r--r-- | modules/private/websites/tools/dav/davical.nix | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/modules/private/websites/tools/dav/davical.nix b/modules/private/websites/tools/dav/davical.nix index eeac1b5..9e4056a 100644 --- a/modules/private/websites/tools/dav/davical.nix +++ b/modules/private/websites/tools/dav/davical.nix | |||
@@ -6,8 +6,7 @@ rec { | |||
6 | install -m 0755 -o ${apache.user} -g ${apache.group} -d /var/lib/php/sessions/davical | 6 | install -m 0755 -o ${apache.user} -g ${apache.group} -d /var/lib/php/sessions/davical |
7 | ''; | 7 | ''; |
8 | }; | 8 | }; |
9 | keys = [{ | 9 | keys."webapps/dav-davical" = { |
10 | dest = "webapps/dav-davical"; | ||
11 | user = apache.user; | 10 | user = apache.user; |
12 | group = apache.group; | 11 | group = apache.group; |
13 | permissions = "0400"; | 12 | permissions = "0400"; |
@@ -64,7 +63,7 @@ rec { | |||
64 | $c->do_not_sync_from_ldap = array('admin' => true); | 63 | $c->do_not_sync_from_ldap = array('admin' => true); |
65 | include('drivers_ldap.php'); | 64 | include('drivers_ldap.php'); |
66 | ''; | 65 | ''; |
67 | }]; | 66 | }; |
68 | webapp = davical.override { davical_config = config.secrets.fullPaths."webapps/dav-davical"; }; | 67 | webapp = davical.override { davical_config = config.secrets.fullPaths."webapps/dav-davical"; }; |
69 | webRoot = "${webapp}/htdocs"; | 68 | webRoot = "${webapp}/htdocs"; |
70 | apache = rec { | 69 | apache = rec { |