Move secrets to flakes

[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 001296509d56277f084f43d7865daa4720ce27ea..c54e1524dc59ae2c0eed1b1f203d4e02d6fe76a7 100644 (file)
--- a/modules/private/websites/tools/dav/default.nix
+++ b/modules/private/websites/tools/dav/default.nix
@@ -18,6 +18,7 @@ let
     davical = pkgs.callPackage ./davical.nix {
       env = config.myEnv.tools.davical;
       inherit (pkgs.webapps) davical awl;
+      inherit config;
     };
 
     cfg = config.myServices.websites.tools.dav;
@@ -38,20 +39,22 @@ in {
       root        = "/run/current-system/webapps/_dav";
       extraConfig = [
         infcloud.vhostConf
-        davical.apache.vhostConf
+        (davical.apache.vhostConf config.services.phpfpm.pools.davical.socket)
       ];
     };
 
     services.phpfpm.pools = {
       davical = {
-        listen = davical.phpFpm.socket;
-        extraConfig = davical.phpFpm.pool;
+        user = config.services.httpd.Tools.user;
+        group = config.services.httpd.Tools.group;
+        settings = davical.phpFpm.pool;
+        phpPackage = pkgs.php72;
       };
     };
 
-    myServices.websites.webappDirs._dav = ./www;
-    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;
   };
 }