Use pools instead of deprecated poolConfigs for php

[perso/Immae/Config/Nix.git] / modules / private / websites / tools / tools / default.nix

diff --git a/modules/private/websites/tools/tools/default.nix b/modules/private/websites/tools/tools/default.nix
index e2a39131d4958d50ba6aaaee95f348f7181b0459..5dc0981ef627e979523ad7d6a7c8fd6a55aa61cb 100644 (file)
--- a/modules/private/websites/tools/tools/default.nix
+++ b/modules/private/websites/tools/tools/default.nix
@@ -224,56 +224,87 @@ in {
       paths = [ "/var/secrets/mpd" ];
     };
 
-    services.phpfpm.pools.devtools = {
-      listen = "/var/run/phpfpm/devtools.sock";
-      extraConfig = ''
-        user = wwwrun
-        group = wwwrun
-        listen.owner = wwwrun
-        listen.group = wwwrun
-        pm = dynamic
-        pm.max_children = 60
-        pm.start_servers = 2
-        pm.min_spare_servers = 1
-        pm.max_spare_servers = 10
+    services.phpfpm.pools = {
+      tools = {
+        listen = "/var/run/phpfpm/tools.sock";
+        extraConfig = ''
+          user = wwwrun
+          group = wwwrun
+          listen.owner = wwwrun
+          listen.group = wwwrun
+          pm = dynamic
+          pm.max_children = 60
+          pm.start_servers = 2
+          pm.min_spare_servers = 1
+          pm.max_spare_servers = 10
 
-        php_admin_value[open_basedir] = "/run/wrappers/bin/sendmail:/var/lib/ftp/devtools.immae.eu:/tmp"
-        '';
-      phpOptions = config.services.phpfpm.phpOptions + ''
-        extension=${pkgs.php}/lib/php/extensions/mysqli.so
-        extension=${pkgs.phpPackages.redis}/lib/php/extensions/redis.so
-        extension=${pkgs.phpPackages.apcu}/lib/php/extensions/apcu.so
-        zend_extension=${pkgs.php}/lib/php/extensions/opcache.so
-        '';
-    };
-
-    services.phpfpm.poolConfigs = {
-      adminer = adminer.phpFpm.pool;
-      ttrss = ttrss.phpFpm.pool;
-      wallabag = wallabag.phpFpm.pool;
-      yourls = yourls.phpFpm.pool;
-      rompr = rompr.phpFpm.pool;
-      shaarli = shaarli.phpFpm.pool;
-      dokuwiki = dokuwiki.phpFpm.pool;
-      ldap = ldap.phpFpm.pool;
-      kanboard = kanboard.phpFpm.pool;
-      grocy = grocy.phpFpm.pool;
-      tools = ''
-        listen = /var/run/phpfpm/tools.sock
-        user = wwwrun
-        group = wwwrun
-        listen.owner = wwwrun
-        listen.group = wwwrun
-        pm = dynamic
-        pm.max_children = 60
-        pm.start_servers = 2
-        pm.min_spare_servers = 1
-        pm.max_spare_servers = 10
+          ; Needed to avoid clashes in browser cookies (same domain)
+          php_value[session.name] = ToolsPHPSESSID
+          php_admin_value[open_basedir] = "/run/wrappers/bin/sendmail:/var/lib/ftp/tools.immae.eu:/tmp"
+          '';
+      };
+      devtools = {
+        listen = "/var/run/phpfpm/devtools.sock";
+        extraConfig = ''
+          user = wwwrun
+          group = wwwrun
+          listen.owner = wwwrun
+          listen.group = wwwrun
+          pm = dynamic
+          pm.max_children = 60
+          pm.start_servers = 2
+          pm.min_spare_servers = 1
+          pm.max_spare_servers = 10
 
-        ; Needed to avoid clashes in browser cookies (same domain)
-        php_value[session.name] = ToolsPHPSESSID
-        php_admin_value[open_basedir] = "/run/wrappers/bin/sendmail:/var/lib/ftp/tools.immae.eu:/tmp"
-        '';
+          php_admin_value[open_basedir] = "/run/wrappers/bin/sendmail:/var/lib/ftp/devtools.immae.eu:/tmp"
+          '';
+        phpOptions = config.services.phpfpm.phpOptions + ''
+          extension=${pkgs.php}/lib/php/extensions/mysqli.so
+          extension=${pkgs.phpPackages.redis}/lib/php/extensions/redis.so
+          extension=${pkgs.phpPackages.apcu}/lib/php/extensions/apcu.so
+          zend_extension=${pkgs.php}/lib/php/extensions/opcache.so
+          '';
+      };
+      adminer = {
+        listen = adminer.phpFpm.socket;
+        extraConfig = adminer.phpFpm.pool;
+      };
+      ttrss = {
+        listen = ttrss.phpFpm.socket;
+        extraConfig = ttrss.phpFpm.pool;
+      };
+      wallabag = {
+        listen = wallabag.phpFpm.socket;
+        extraConfig = wallabag.phpFpm.pool;
+      };
+      yourls = {
+        listen = yourls.phpFpm.socket;
+        extraConfig = yourls.phpFpm.pool;
+      };
+      rompr = {
+        listen = rompr.phpFpm.socket;
+        extraConfig = rompr.phpFpm.pool;
+      };
+      shaarli = {
+        listen = shaarli.phpFpm.socket;
+        extraConfig = shaarli.phpFpm.pool;
+      };
+      dokuwiki = {
+        listen = dokuwiki.phpFpm.socket;
+        extraConfig = dokuwiki.phpFpm.pool;
+      };
+      ldap = {
+        listen = ldap.phpFpm.socket;
+        extraConfig = ldap.phpFpm.pool;
+      };
+      kanboard = {
+        listen = kanboard.phpFpm.socket;
+        extraConfig = kanboard.phpFpm.pool;
+      };
+      grocy = {
+        listen = grocy.phpFpm.socket;
+        extraConfig = grocy.phpFpm.pool;
+      };
     };
 
     system.activationScripts = {