Add config for CI

[perso/Immae/Config/Nix.git] / modules / private / websites / tools / dav / davical.nix

diff --git a/modules/private/websites/tools/dav/davical.nix b/modules/private/websites/tools/dav/davical.nix
index eeac1b5643d97171665c518deecdf83ae6b0d059..bc5ecf695bf5aed35d303ce199d5d0503f70c71e 100644 (file)
--- a/modules/private/websites/tools/dav/davical.nix
+++ b/modules/private/websites/tools/dav/davical.nix
@@ -6,8 +6,7 @@ rec {
       install -m 0755 -o ${apache.user} -g ${apache.group} -d /var/lib/php/sessions/davical
       '';
   };
-  keys = [{
-    dest = "webapps/dav-davical";
+  keys."webapps/dav-davical" = {
     user = apache.user;
     group = apache.group;
     permissions = "0400";
@@ -64,15 +63,14 @@ rec {
       $c->do_not_sync_from_ldap = array('admin' => true);
       include('drivers_ldap.php');
     '';
-  }];
+  };
   webapp = davical.override { davical_config = config.secrets.fullPaths."webapps/dav-davical"; };
   webRoot = "${webapp}/htdocs";
   apache = rec {
     user = "wwwrun";
     group = "wwwrun";
     modules = [ "proxy_fcgi" ];
-    webappName = "tools_davical";
-    root = "/run/current-system/webapps/${webappName}";
+    root = webRoot;
     vhostConf = socket: ''
       Alias /davical "${root}"
       Alias /caldav.php  "${root}/caldav.php"