diff options
Diffstat (limited to 'nixops/modules/websites/tools/dav')
-rw-r--r-- | nixops/modules/websites/tools/dav/davical.nix | 12 | ||||
-rw-r--r-- | nixops/modules/websites/tools/dav/default.nix | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/nixops/modules/websites/tools/dav/davical.nix b/nixops/modules/websites/tools/dav/davical.nix index 89ba568..1e3893f 100644 --- a/nixops/modules/websites/tools/dav/davical.nix +++ b/nixops/modules/websites/tools/dav/davical.nix | |||
@@ -16,8 +16,8 @@ let | |||
16 | ''; | 16 | ''; |
17 | }; | 17 | }; |
18 | davical = rec { | 18 | davical = rec { |
19 | keys."dav-davical" = { | 19 | keys = [{ |
20 | destDir = "/run/keys/webapps"; | 20 | dest = "webapps/dav-davical"; |
21 | user = apache.user; | 21 | user = apache.user; |
22 | group = apache.group; | 22 | group = apache.group; |
23 | permissions = "0400"; | 23 | permissions = "0400"; |
@@ -74,7 +74,7 @@ let | |||
74 | $c->do_not_sync_from_ldap = array('admin' => true); | 74 | $c->do_not_sync_from_ldap = array('admin' => true); |
75 | include('drivers_ldap.php'); | 75 | include('drivers_ldap.php'); |
76 | ''; | 76 | ''; |
77 | }; | 77 | }]; |
78 | webapp = stdenv.mkDerivation rec { | 78 | webapp = stdenv.mkDerivation rec { |
79 | version = "1.1.7"; | 79 | version = "1.1.7"; |
80 | name = "davical-${version}"; | 80 | name = "davical-${version}"; |
@@ -90,7 +90,7 @@ let | |||
90 | installPhase = '' | 90 | installPhase = '' |
91 | mkdir -p $out | 91 | mkdir -p $out |
92 | cp -ra config dba docs htdocs inc locale po scripts testing zonedb $out | 92 | cp -ra config dba docs htdocs inc locale po scripts testing zonedb $out |
93 | ln -s /run/keys/webapps/dav-davical $out/config/config.php | 93 | ln -s /var/secrets/webapps/dav-davical $out/config/config.php |
94 | ''; | 94 | ''; |
95 | buildInputs = [ gettext ]; | 95 | buildInputs = [ gettext ]; |
96 | }; | 96 | }; |
@@ -137,8 +137,8 @@ let | |||
137 | ''; | 137 | ''; |
138 | }; | 138 | }; |
139 | phpFpm = rec { | 139 | phpFpm = rec { |
140 | serviceDeps = [ "postgresql.service" "openldap.service" "dav-davical-key.service" ]; | 140 | serviceDeps = [ "postgresql.service" "openldap.service" ]; |
141 | basedir = builtins.concatStringsSep ":" [ webapp "/run/keys/webapps/dav-davical" awl ]; | 141 | basedir = builtins.concatStringsSep ":" [ webapp "/var/secrets/webapps/dav-davical" awl ]; |
142 | socket = "/var/run/phpfpm/davical.sock"; | 142 | socket = "/var/run/phpfpm/davical.sock"; |
143 | pool = '' | 143 | pool = '' |
144 | listen = ${socket} | 144 | listen = ${socket} |
diff --git a/nixops/modules/websites/tools/dav/default.nix b/nixops/modules/websites/tools/dav/default.nix index 56b3006..2a82a1d 100644 --- a/nixops/modules/websites/tools/dav/default.nix +++ b/nixops/modules/websites/tools/dav/default.nix | |||
@@ -14,7 +14,7 @@ in { | |||
14 | config = lib.mkIf cfg.enable { | 14 | config = lib.mkIf cfg.enable { |
15 | security.acme.certs."eldiron".extraDomains."dav.immae.eu" = null; | 15 | security.acme.certs."eldiron".extraDomains."dav.immae.eu" = null; |
16 | 16 | ||
17 | deployment.keys = davical.keys; | 17 | mySecrets.keys = davical.keys; |
18 | services.myWebsites.tools.modules = davical.apache.modules; | 18 | services.myWebsites.tools.modules = davical.apache.modules; |
19 | 19 | ||
20 | services.myWebsites.tools.vhostConfs.dav = { | 20 | services.myWebsites.tools.vhostConfs.dav = { |