Use pools instead of deprecated poolConfigs for php

[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 5a0f4704f74df2bc50050c66a3e782de3439962d..001296509d56277f084f43d7865daa4720ce27ea 100644 (file)
--- 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;
     };
 
@@ -35,17 +35,21 @@ in {
       certName    = "eldiron";
       addToCerts  = true;
       hosts       = ["dav.immae.eu" ];
-      root        = null;
+      root        = "/run/current-system/webapps/_dav";
       extraConfig = [
         infcloud.vhostConf
         davical.apache.vhostConf
       ];
     };
 
-    services.phpfpm.poolConfigs = {
-      davical = davical.phpFpm.pool;
+    services.phpfpm.pools = {
+      davical = {
+        listen = davical.phpFpm.socket;
+        extraConfig = davical.phpFpm.pool;
+      };
     };
 
+    myServices.websites.webappDirs._dav = ./www;
     myServices.websites.webappDirs."${davical.apache.webappName}" = davical.webRoot;
     myServices.websites.webappDirs."${infcloud.webappName}" = pkgs.webapps.infcloud;
   };