2 files changed, 3 insertions, 9 deletions

diff --git a/modules/private/websites/tools/dav/davical.nix b/modules/private/websites/tools/dav/davical.nix
index 9e4056a..bc5ecf6 100644
--- a/modules/private/websites/tools/dav/davical.nix
+++ b/modules/private/websites/tools/dav/davical.nix
@@ -70,8 +70,7 @@ 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"
diff --git a/modules/private/websites/tools/dav/default.nix b/modules/private/websites/tools/dav/default.nix
index c54e152..b3aa03d 100644
--- a/modules/private/websites/tools/dav/default.nix
+++ b/modules/private/websites/tools/dav/default.nix
@@ -1,8 +1,7 @@
 { lib, pkgs, config,  ... }:
 let
     infcloud = rec {
-      webappName = "tools_infcloud";
-      root = "/run/current-system/webapps/${webappName}";
+      root = pkgs.webapps.infcloud;
       vhostConf = ''
           Alias /carddavmate ${root}
           Alias /caldavzap ${root}
@@ -36,7 +35,7 @@ in {
       certName    = "eldiron";
       addToCerts  = true;
       hosts       = ["dav.immae.eu" ];
-      root        = "/run/current-system/webapps/_dav";
+      root        = ./www;
       extraConfig = [
         infcloud.vhostConf
         (davical.apache.vhostConf config.services.phpfpm.pools.davical.socket)
@@ -51,10 +50,6 @@ in {
         phpPackage = pkgs.php72;
       };
     };
-
-    services.websites.webappDirs._dav = ./www;
-    services.websites.webappDirs."${davical.apache.webappName}" = davical.webRoot;
-    services.websites.webappDirs."${infcloud.webappName}" = pkgs.webapps.infcloud;
   };
 }