Remove overlay that overrides the php version

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

diff --git a/modules/private/websites/tools/dav/default.nix b/modules/private/websites/tools/dav/default.nix
index d30c04a9e5616b6be3d35b2c6cf476b0a954d7b7..f53cf5803567e16e1228a112662f49ac82458a95 100644 (file)
--- a/modules/private/websites/tools/dav/default.nix
+++ b/modules/private/websites/tools/dav/default.nix
@@ -35,19 +35,25 @@ in {
       certName    = "eldiron";
       addToCerts  = true;
       hosts       = ["dav.immae.eu" ];
-      root        = null;
+      root        = "/run/current-system/webapps/_dav";
       extraConfig = [
         infcloud.vhostConf
-        davical.apache.vhostConf
+        (davical.apache.vhostConf config.services.phpfpm.pools.davical.socket)
       ];
     };
 
-    services.phpfpm.poolConfigs = {
-      davical = davical.phpFpm.pool;
+    services.phpfpm.pools = {
+      davical = {
+        user = config.services.httpd.Tools.user;
+        group = config.services.httpd.Tools.group;
+        settings = davical.phpFpm.pool;
+        phpPackage = pkgs.php72;
+      };
     };
 
-    myServices.websites.webappDirs."${davical.apache.webappName}" = davical.webRoot;
-    myServices.websites.webappDirs."${infcloud.webappName}" = pkgs.webapps.infcloud;
+    services.websites.webappDirs._dav = ./www;
+    services.websites.webappDirs."${davical.apache.webappName}" = davical.webRoot;
+    services.websites.webappDirs."${infcloud.webappName}" = pkgs.webapps.infcloud;
   };
 }