diff options
Diffstat (limited to 'modules/private/websites/tools/dav/davical.nix')
-rw-r--r-- | modules/private/websites/tools/dav/davical.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/modules/private/websites/tools/dav/davical.nix b/modules/private/websites/tools/dav/davical.nix index 9d6cd21..eeac1b5 100644 --- a/modules/private/websites/tools/dav/davical.nix +++ b/modules/private/websites/tools/dav/davical.nix | |||
@@ -1,4 +1,4 @@ | |||
1 | { stdenv, fetchurl, gettext, writeText, env, awl, davical }: | 1 | { stdenv, fetchurl, gettext, writeText, env, awl, davical, config }: |
2 | rec { | 2 | rec { |
3 | activationScript = { | 3 | activationScript = { |
4 | deps = [ "httpd" ]; | 4 | deps = [ "httpd" ]; |
@@ -65,7 +65,7 @@ rec { | |||
65 | include('drivers_ldap.php'); | 65 | include('drivers_ldap.php'); |
66 | ''; | 66 | ''; |
67 | }]; | 67 | }]; |
68 | webapp = davical.override { davical_config = "/var/secrets/webapps/dav-davical"; }; | 68 | webapp = davical.override { davical_config = config.secrets.fullPaths."webapps/dav-davical"; }; |
69 | webRoot = "${webapp}/htdocs"; | 69 | webRoot = "${webapp}/htdocs"; |
70 | apache = rec { | 70 | apache = rec { |
71 | user = "wwwrun"; | 71 | user = "wwwrun"; |
@@ -110,7 +110,7 @@ rec { | |||
110 | }; | 110 | }; |
111 | phpFpm = rec { | 111 | phpFpm = rec { |
112 | serviceDeps = [ "postgresql.service" "openldap.service" ]; | 112 | serviceDeps = [ "postgresql.service" "openldap.service" ]; |
113 | basedir = builtins.concatStringsSep ":" [ webapp "/var/secrets/webapps/dav-davical" awl ]; | 113 | basedir = builtins.concatStringsSep ":" [ webapp config.secrets.fullPaths."webapps/dav-davical" awl ]; |
114 | pool = { | 114 | pool = { |
115 | "listen.owner" = apache.user; | 115 | "listen.owner" = apache.user; |
116 | "listen.group" = apache.group; | 116 | "listen.group" = apache.group; |