X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=nixops%2Fmodules%2Fwebsites%2Ftools%2Fcloud.nix;h=5d2ca401a67eabbe7b002195b851bfbac7d22c19;hb=f40f5b235b890f46770a22f005f8a0f664cf0562;hp=5e010f4332cb9aac9859d26d15dbe30edf4afed5;hpb=7df420c27ebe7daaa4fd099c457ce9a9075b840e;p=perso%2FImmae%2FConfig%2FNix.git

diff --git a/nixops/modules/websites/tools/cloud.nix b/nixops/modules/websites/tools/cloud.nix
index 5e010f4..5d2ca40 100644
--- a/nixops/modules/websites/tools/cloud.nix
+++ b/nixops/modules/websites/tools/cloud.nix
@@ -17,7 +17,6 @@ let
       zend_extension=${pkgs.php}/lib/php/extensions/opcache.so
       '';
     pool = ''
-      listen = ${socket}
       user = wwwrun
       group = wwwrun
       listen.owner = wwwrun
@@ -170,9 +169,10 @@ in {
       ln -s ${nextcloud} $out/webapps/${webappName}
       '';
 
-    services.myPhpfpm = {
-      poolPhpConfigs.nextcloud = phpFpm.phpConfig;
-      poolConfigs.nextcloud = phpFpm.pool;
+    services.phpfpm.pools.nextcloud = {
+      listen = phpFpm.socket;
+      extraConfig = phpFpm.pool;
+      phpOptions = config.services.phpfpm.phpOptions + phpFpm.phpConfig;
     };
 
     services.cron = {