Replace myPhpfpm with correct overrides

[perso/Immae/Config/Nix.git] / modules / private / websites / chloe / production.nix

diff --git a/modules/private/websites/chloe/production.nix b/modules/private/websites/chloe/production.nix
index 0eafebdc6e76d41160b8b5f8527252536ed52deb..d4b22994d0a98d1c143ea60125253f82904f8323 100644 (file)
--- 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