X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=modules%2Fprivate%2Fwebsites%2Ftools%2Fdav%2Fdefault.nix;h=c74930a90a8f96260742d2fbf42dc3ab80e7aec5;hb=f00e1c4bc8279400edf0ef56983e59a3fe95a8f3;hp=fb0baaece9f034441871b8fbbee932ece46bb263;hpb=4288c2f2431fb782b0d512b1b3749187f2374b6a;p=perso%2FImmae%2FConfig%2FNix.git

diff --git a/modules/private/websites/tools/dav/default.nix b/modules/private/websites/tools/dav/default.nix
index fb0baae..c74930a 100644
--- a/modules/private/websites/tools/dav/default.nix
+++ b/modules/private/websites/tools/dav/default.nix
@@ -1,4 +1,4 @@
-{ lib, pkgs, config, myconfig,  ... }:
+{ lib, pkgs, config,  ... }:
 let
     infcloud = rec {
       webappName = "tools_infcloud";
@@ -16,7 +16,7 @@ let
       '';
     };
     davical = pkgs.callPackage ./davical.nix {
-      env = myconfig.env.tools.davical;
+      env = config.myEnv.tools.davical;
       inherit (pkgs.webapps) davical awl;
     };
 
@@ -29,13 +29,13 @@ in {
   config = lib.mkIf cfg.enable {
     system.activationScripts.davical = davical.activationScript;
     secrets.keys = davical.keys;
-    services.websites.tools.modules = davical.apache.modules;
+    services.websites.env.tools.modules = davical.apache.modules;
 
-    services.websites.tools.vhostConfs.dav = {
+    services.websites.env.tools.vhostConfs.dav = {
       certName    = "eldiron";
       addToCerts  = true;
       hosts       = ["dav.immae.eu" ];
-      root        = null;
+      root        = "/run/current-system/webapps/_dav";
       extraConfig = [
         infcloud.vhostConf
         davical.apache.vhostConf
@@ -46,6 +46,7 @@ in {
       davical = davical.phpFpm.pool;
     };
 
+    myServices.websites.webappDirs._dav = ./www;
     myServices.websites.webappDirs."${davical.apache.webappName}" = davical.webRoot;
     myServices.websites.webappDirs."${infcloud.webappName}" = pkgs.webapps.infcloud;
   };