Upgrade nixos

[perso/Immae/Config/Nix.git] / modules / private / websites / isabelle / iridologie.nix

diff --git a/modules/private/websites/isabelle/iridologie.nix b/modules/private/websites/isabelle/iridologie.nix
index 460bd2a902db048e8c6ae9148036883a8e5056d7..ffbf2591f2bd107fe2c090a0d4d4222445bc6da1 100644 (file)
--- a/modules/private/websites/isabelle/iridologie.nix
+++ b/modules/private/websites/isabelle/iridologie.nix
@@ -19,8 +19,9 @@ in {
     systemd.services.phpfpm-iridologie.after = lib.mkAfter iridologie.phpFpm.serviceDeps;
     systemd.services.phpfpm-iridologie.wants = iridologie.phpFpm.serviceDeps;
     services.phpfpm.pools.iridologie = {
-      listen = iridologie.phpFpm.socket;
-      extraConfig = iridologie.phpFpm.pool;
+      user = config.services.httpd.Prod.user;
+      group = config.services.httpd.Prod.group;
+      settings = iridologie.phpFpm.pool;
       phpOptions = config.services.phpfpm.phpOptions + ''
         extension=${pkgs.php}/lib/php/extensions/mysqli.so
       '';
@@ -39,7 +40,7 @@ in {
           RewriteCond "%{HTTP_HOST}" "!^iridologie\.icommandeur\.org$" [NC]
           RewriteRule ^(.+)$ https://iridologie.icommandeur.org$1 [R=302,L]
           ''
-        iridologie.apache.vhostConf
+        (iridologie.apache.vhostConf config.services.phpfpm.pools.iridologie.socket)
       ];
     };
     services.websites.env.production.watchPaths = [