X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=nixops%2Fmodules%2Fwebsites%2Ftools%2Fdav%2Fdavical.nix;h=f6cb5bbe86d6f39d17a01ad3a7d6eb5f0ae90240;hb=0f466f6d5aec0d3fcf406fe2bb71effa5a1a1386;hp=3f43607312b740008ccde40da0540a5991e75360;hpb=7ebcaad53a3261d8a4aefd8a64c5c7d9d8ac2fa0;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 3f43607..f6cb5bb 100644
--- a/nixops/modules/websites/tools/dav/davical.nix
+++ b/nixops/modules/websites/tools/dav/davical.nix
@@ -22,7 +22,7 @@ let
 
         $c->readonly_webdav_collections = false;
 
-        $c->admin_email ='davical@immae.eu';
+        $c->admin_email ='davical@tools.immae.eu';
 
         $c->restrict_setup_to_admin = true;
 
@@ -89,14 +89,16 @@ let
       buildInputs = [ gettext ];
     };
     webRoot = "${webapp}/htdocs";
-    apache = {
+    apache = rec {
       user = "wwwrun";
       group = "wwwrun";
       modules = [ "proxy_fcgi" ];
+      webappName = "tools_davical";
+      root = "/run/current-system/webapps/${webappName}";
       vhostConf = ''
-        Alias /davical "${webRoot}"
-        Alias /caldav.php  "${webRoot}/caldav.php"
-        <Directory "${webRoot}">
+        Alias /davical "${root}"
+        Alias /caldav.php  "${root}/caldav.php"
+        <Directory "${root}">
           DirectoryIndex index.php index.html
           AcceptPathInfo On
           AllowOverride None