Replace myPhpfpm with correct overrides

3 files changed, 16 insertions, 9 deletions

diff --git a/modules/private/websites/chloe/builder.nix b/modules/private/websites/chloe/builder.nix
index 7b72b97..f65e9a9 100644
--- a/modules/private/websites/chloe/builder.nix
+++ b/modules/private/websites/chloe/builder.nix
@@ -5,7 +5,6 @@ rec {
     serviceDeps = [ "mysql.service" ];
     socket = "/var/run/phpfpm/chloe-${app.environment}.sock";
     pool = ''
-      listen = ${socket}
       user = ${apacheUser}
       group = ${apacheGroup}
       listen.owner = ${apacheUser}
diff --git a/modules/private/websites/chloe/integration.nix b/modules/private/websites/chloe/integration.nix
index 458e414..d49a85c 100644
--- a/modules/private/websites/chloe/integration.nix
+++ b/modules/private/websites/chloe/integration.nix
@@ -13,11 +13,15 @@ in {
 
   config = lib.mkIf cfg.enable {
     secrets.keys = chloe.keys;
-    services.myPhpfpm.serviceDependencies.chloe_dev = chloe.phpFpm.serviceDeps;
-    services.myPhpfpm.poolConfigs.chloe_dev = chloe.phpFpm.pool;
-    services.myPhpfpm.poolPhpConfigs.chloe_dev = ''
-      extension=${pkgs.php}/lib/php/extensions/mysqli.so
+    systemd.services.phpfpm-chloe_dev.after = lib.mkAfter chloe.phpFpm.serviceDeps;
+    systemd.services.phpfpm-chloe_dev.wants = chloe.phpFpm.serviceDeps;
+    services.phpfpm.pools.chloe_dev = {
+      listen = chloe.phpFpm.socket;
+      extraConfig = chloe.phpFpm.pool;
+      phpOptions = config.services.phpfpm.phpOptions + ''
+        extension=${pkgs.php}/lib/php/extensions/mysqli.so
       '';
+    };
     system.activationScripts.chloe_dev = chloe.activationScript;
     system.extraSystemBuilderCmds = ''
       mkdir -p $out/webapps
diff --git a/modules/private/websites/chloe/production.nix b/modules/private/websites/chloe/production.nix
index 0eafebd..d4b2299 100644
--- a/modules/private/websites/chloe/production.nix
+++ b/modules/private/websites/chloe/production.nix
@@ -15,11 +15,15 @@ in {
     secrets.keys = chloe.keys;
     services.webstats.sites = [ { name = "osteopathe-cc.fr"; } ];
 
-    services.myPhpfpm.serviceDependencies.chloe_prod = chloe.phpFpm.serviceDeps;
-    services.myPhpfpm.poolConfigs.chloe_prod = chloe.phpFpm.pool;
-    services.myPhpfpm.poolPhpConfigs.chloe_prod = ''
-      extension=${pkgs.php}/lib/php/extensions/mysqli.so
+    systemd.services.phpfpm-chloe_prod.after = lib.mkAfter chloe.phpFpm.serviceDeps;
+    systemd.services.phpfpm-chloe_prod.wants = chloe.phpFpm.serviceDeps;
+    services.phpfpm.pools.chloe_prod = {
+      listen = chloe.phpFpm.socket;
+      extraConfig = chloe.phpFpm.pool;
+      phpOptions = config.services.phpfpm.phpOptions + ''
+        extension=${pkgs.php}/lib/php/extensions/mysqli.so
       '';
+    };
     system.activationScripts.chloe_prod = chloe.activationScript;
     system.extraSystemBuilderCmds = ''
       mkdir -p $out/webapps