X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=nixops%2Fmodules%2Fwebsites%2Ftools%2Fdav%2Fdavical.nix;fp=nixops%2Fmodules%2Fwebsites%2Ftools%2Fdav%2Fdavical.nix;h=1e3893fea3ad1a3dcc41903479aef06a5174bcff;hb=8db8e666707a0e51af9353c76c5863e1a5482ed5;hp=89ba5683ce630b8649d9ca3c2fcf560e577bc6f5;hpb=32c84ff89c2b8931f58cea63961a178a9b1d0efe;p=perso%2FImmae%2FConfig%2FNix.git

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
     '';
   };
   davical = rec {
-    keys."dav-davical" = {
-      destDir = "/run/keys/webapps";
+    keys = [{
+      dest = "webapps/dav-davical";
       user = apache.user;
       group = apache.group;
       permissions = "0400";
@@ -74,7 +74,7 @@ let
         $c->do_not_sync_from_ldap = array('admin' => true);
         include('drivers_ldap.php');
       '';
-    };
+    }];
     webapp = stdenv.mkDerivation rec {
       version = "1.1.7";
       name = "davical-${version}";
@@ -90,7 +90,7 @@ let
       installPhase = ''
         mkdir -p $out
         cp -ra config dba docs htdocs inc locale po scripts testing zonedb $out
-        ln -s /run/keys/webapps/dav-davical $out/config/config.php
+        ln -s /var/secrets/webapps/dav-davical $out/config/config.php
       '';
       buildInputs = [ gettext ];
     };
@@ -137,8 +137,8 @@ let
         '';
     };
     phpFpm = rec {
-      serviceDeps = [ "postgresql.service" "openldap.service" "dav-davical-key.service" ];
-      basedir = builtins.concatStringsSep ":" [ webapp "/run/keys/webapps/dav-davical" awl ];
+      serviceDeps = [ "postgresql.service" "openldap.service" ];
+      basedir = builtins.concatStringsSep ":" [ webapp "/var/secrets/webapps/dav-davical" awl ];
       socket = "/var/run/phpfpm/davical.sock";
       pool = ''
         listen = ${socket}