X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=modules%2Fprivate%2Fwebsites%2Ftools%2Fdav%2Fdefault.nix;h=b3aa03deb7336c697c028b5bfdfcab704286826a;hb=fa25ffd4583cc362075cd5e1b4130f33306103f0;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..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, myconfig,  ... }:
+{ 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}
@@ -16,8 +15,9 @@ let
       '';
     };
     davical = pkgs.callPackage ./davical.nix {
-      env = myconfig.env.tools.davical;
+      env = config.myEnv.tools.davical;
       inherit (pkgs.webapps) davical awl;
+      inherit config;
     };
 
     cfg = config.myServices.websites.tools.dav;
@@ -29,25 +29,27 @@ 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        = ./www;
       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;
   };
 }