Use pools instead of deprecated poolConfigs for php

diff --git a/modules/private/tasks/default.nix b/modules/private/tasks/default.nix
index c0cc87bc353000c2f05d2d49ac267d7517014677..78e07c1adb2862137b0c65a00602863fdd0106f2 100644 (file)
--- a/modules/private/tasks/default.nix
+++ b/modules/private/tasks/default.nix
@@ -170,24 +170,26 @@ in {
         </Location>
         '') env.taskwarrior-web);
     };
-    services.phpfpm.poolConfigs = {
-      tasks = ''
-        listen = /var/run/phpfpm/task.sock
-        user = ${user}
-        group = ${group}
-        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 = {
+      tasks = {
+        listen = "/var/run/phpfpm/task.sock";
+        extraConfig = ''
+          user = ${user}
+          group = ${group}
+          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)
-        env[PATH] = "/etc/profiles/per-user/${user}/bin"
-        php_value[session.name] = TaskPHPSESSID
-        php_admin_value[open_basedir] = "${./www}:/tmp:${server_vardir}:/etc/profiles/per-user/${user}/bin/"
-      '';
+          ; Needed to avoid clashes in browser cookies (same domain)
+          env[PATH] = "/etc/profiles/per-user/${user}/bin"
+          php_value[session.name] = TaskPHPSESSID
+          php_admin_value[open_basedir] = "${./www}:/tmp:${server_vardir}:/etc/profiles/per-user/${user}/bin/"
+        '';
+      };
     };
 
     myServices.websites.webappDirs._task = ./www;

diff --git a/modules/private/websites/leila/production.nix b/modules/private/websites/leila/production.nix
index 4390d592d7e99039bc70ccaf45eba24c6183ef08..e8591c83d78a6627736267c21f2f6d4a2bd76021 100644 (file)
--- a/modules/private/websites/leila/production.nix
+++ b/modules/private/websites/leila/production.nix
@@ -6,19 +6,21 @@ in {
   options.myServices.websites.leila.production.enable = lib.mkEnableOption "enable Leila's websites in production";
 
   config = lib.mkIf cfg.enable {
-    services.phpfpm.poolConfigs.leila = ''
-      listen = /run/phpfpm/leila.sock
-      user = wwwrun
-      group = wwwrun
-      listen.owner = wwwrun
-      listen.group = wwwrun
+    services.phpfpm.pools.leila = {
+      listen = "/run/phpfpm/leila.sock";
+      extraConfig = ''
+        user = wwwrun
+        group = wwwrun
+        listen.owner = wwwrun
+        listen.group = wwwrun
 
-      pm = ondemand
-      pm.max_children = 5
-      pm.process_idle_timeout = 60
+        pm = ondemand
+        pm.max_children = 5
+        pm.process_idle_timeout = 60
 
-      php_admin_value[open_basedir] = "${varDir}:/tmp"
+        php_admin_value[open_basedir] = "${varDir}:/tmp"
       '';
+    };
 
     services.webstats.sites = [
       { name = "leila.bouya.org"; }

diff --git a/modules/private/websites/tools/dav/davical.nix b/modules/private/websites/tools/dav/davical.nix
index 2a02f5e64d1ec952eb58fb72bef0aeded26bd1df..5eb3fab71e5f43c4a0190e7cbb10f4041d805df4 100644 (file)
--- a/modules/private/websites/tools/dav/davical.nix
+++ b/modules/private/websites/tools/dav/davical.nix
@@ -113,7 +113,6 @@ rec {
     basedir = builtins.concatStringsSep ":" [ webapp "/var/secrets/webapps/dav-davical" awl ];
     socket = "/var/run/phpfpm/davical.sock";
     pool = ''
-      listen = ${socket}
       user = ${apache.user}
       group = ${apache.group}
       listen.owner = ${apache.user}

diff --git a/modules/private/websites/tools/dav/default.nix b/modules/private/websites/tools/dav/default.nix
index c74930a90a8f96260742d2fbf42dc3ab80e7aec5..001296509d56277f084f43d7865daa4720ce27ea 100644 (file)
--- a/modules/private/websites/tools/dav/default.nix
+++ b/modules/private/websites/tools/dav/default.nix
@@ -42,8 +42,11 @@ in {
       ];
     };
 
-    services.phpfpm.poolConfigs = {
-      davical = davical.phpFpm.pool;
+    services.phpfpm.pools = {
+      davical = {
+        listen = davical.phpFpm.socket;
+        extraConfig = davical.phpFpm.pool;
+      };
     };
 
     myServices.websites.webappDirs._dav = ./www;

diff --git a/modules/private/websites/tools/git/default.nix b/modules/private/websites/tools/git/default.nix
index a5f525bdad765308c97f6efc7f3e6fe637c8db37..054e47bec2bc5405285f1aafa0be336227782f73 100644 (file)
--- a/modules/private/websites/tools/git/default.nix
+++ b/modules/private/websites/tools/git/default.nix
@@ -38,8 +38,11 @@ in {
           ''
       ];
     };
-    services.phpfpm.poolConfigs = {
-      mantisbt = mantisbt.phpFpm.pool;
+    services.phpfpm.pools = {
+      mantisbt = {
+        listen = mantisbt.phpFpm.socket;
+        extraConfig = mantisbt.phpFpm.pool;
+      };
     };
   };
 }

diff --git a/modules/private/websites/tools/git/mantisbt.nix b/modules/private/websites/tools/git/mantisbt.nix
index 8606819eb36dc1fc515fb6916c533b615c338759..d75b022d74b4c7364208232e4539ee0443de7dd4 100644 (file)
--- a/modules/private/websites/tools/git/mantisbt.nix
+++ b/modules/private/websites/tools/git/mantisbt.nix
@@ -78,7 +78,6 @@ rec {
       ++ webRoot.plugins);
     socket = "/var/run/phpfpm/mantisbt.sock";
     pool = ''
-      listen = ${socket}
       user = ${apache.user}
       group = ${apache.group}
       listen.owner = ${apache.user}

diff --git a/modules/private/websites/tools/mail/default.nix b/modules/private/websites/tools/mail/default.nix
index 634269490b908eb7b35febff418e665ec766f9bc..bb3604231e399d5f321ee41936e2c3808eee4e7f 100644 (file)
--- a/modules/private/websites/tools/mail/default.nix
+++ b/modules/private/websites/tools/mail/default.nix
@@ -60,8 +60,9 @@ in
       extraConfig = roundcubemail.phpFpm.pool;
       phpOptions = config.services.phpfpm.phpOptions + roundcubemail.phpFpm.phpConfig;
     };
-    services.phpfpm.poolConfigs = {
-      rainloop = rainloop.phpFpm.pool;
+    services.phpfpm.pools.rainloop = {
+      listen = rainloop.phpFpm.socket;
+      extraConfig = rainloop.phpFpm.pool;
     };
     system.activationScripts = {
       roundcubemail = roundcubemail.activationScript;

diff --git a/modules/private/websites/tools/mail/rainloop.nix b/modules/private/websites/tools/mail/rainloop.nix
index dbf0f248e50773c7bc1351b5989bc5b824fa5eda..2dad46e72a49f0e32775b223b07f3aeb40503118 100644 (file)
--- a/modules/private/websites/tools/mail/rainloop.nix
+++ b/modules/private/websites/tools/mail/rainloop.nix
@@ -39,7 +39,6 @@ rec {
     basedir = builtins.concatStringsSep ":" [ webRoot varDir ];
     socket = "/var/run/phpfpm/rainloop.sock";
     pool = ''
-      listen = ${socket}
       user = ${apache.user}
       group = ${apache.group}
       listen.owner = ${apache.user}

diff --git a/modules/private/websites/tools/tools/adminer.nix b/modules/private/websites/tools/tools/adminer.nix
index e41c488985fc00f5981a879c07cf07a493cb0948..907e37fc857c73fad21e197ff43a0672140124b1 100644 (file)
--- a/modules/private/websites/tools/tools/adminer.nix
+++ b/modules/private/websites/tools/tools/adminer.nix
@@ -11,7 +11,6 @@ rec {
   phpFpm = rec {
     socket = "/var/run/phpfpm/adminer.sock";
     pool = ''
-      listen = ${socket}
       user = ${apache.user}
       group = ${apache.group}
       listen.owner = ${apache.user}

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 = {

diff --git a/modules/private/websites/tools/tools/dokuwiki.nix b/modules/private/websites/tools/tools/dokuwiki.nix
index e40d671d9b506cd176d9f65776d54e747bd18682..d66e85db746044263aac72d0641c5c947a424650 100644 (file)
--- a/modules/private/websites/tools/tools/dokuwiki.nix
+++ b/modules/private/websites/tools/tools/dokuwiki.nix
@@ -46,7 +46,6 @@ rec {
       [ webRoot varDir ] ++ webRoot.plugins);
     socket = "/var/run/phpfpm/dokuwiki.sock";
     pool = ''
-      listen = ${socket}
       user = ${apache.user}
       group = ${apache.group}
       listen.owner = ${apache.user}

diff --git a/modules/private/websites/tools/tools/grocy.nix b/modules/private/websites/tools/tools/grocy.nix
index c16503019ad56b576d2a193fc102536d383bccfb..1b8da20414bfdaa64a07e155d4173d200d4bf6b5 100644 (file)
--- a/modules/private/websites/tools/tools/grocy.nix
+++ b/modules/private/websites/tools/tools/grocy.nix
@@ -37,7 +37,6 @@ rec {
       [ grocy grocy.yarnModules varDir ]);
     socket = "/var/run/phpfpm/grocy.sock";
     pool = ''
-      listen = ${socket}
       user = ${apache.user}
       group = ${apache.group}
       listen.owner = ${apache.user}

diff --git a/modules/private/websites/tools/tools/kanboard.nix b/modules/private/websites/tools/tools/kanboard.nix
index 36a949c4e33e2499188738b7b80ab3573b68d110..1880cbd27d98af8e49416c4bcbc247e2fa28900b 100644 (file)
--- a/modules/private/websites/tools/tools/kanboard.nix
+++ b/modules/private/websites/tools/tools/kanboard.nix
@@ -71,7 +71,6 @@ rec {
     basedir = builtins.concatStringsSep ":" [ webRoot varDir "/var/secrets/webapps/tools-kanboard" ];
     socket = "/var/run/phpfpm/kanboard.sock";
     pool = ''
-      listen = ${socket}
       user = ${apache.user}
       group = ${apache.group}
       listen.owner = ${apache.user}

diff --git a/modules/private/websites/tools/tools/ldap.nix b/modules/private/websites/tools/tools/ldap.nix
index 96bd02cd12d1b930937cd9403d9fc5f9ed1daebe..e58a9bd30538efee7c218256875d44ec71612458 100644 (file)
--- a/modules/private/websites/tools/tools/ldap.nix
+++ b/modules/private/websites/tools/tools/ldap.nix
@@ -57,7 +57,6 @@ rec {
     basedir = builtins.concatStringsSep ":" [ webRoot "/var/secrets/webapps/tools-ldap" ];
     socket = "/var/run/phpfpm/ldap.sock";
     pool = ''
-      listen = ${socket}
       user = ${apache.user}
       group = ${apache.group}
       listen.owner = ${apache.user}

diff --git a/modules/private/websites/tools/tools/rompr.nix b/modules/private/websites/tools/tools/rompr.nix
index 74034f04617fb1a29a35beefbc607a348e3ab6c3..75adabe5ef09ac9c2719d5e15cddd69b0625d5c3 100644 (file)
--- a/modules/private/websites/tools/tools/rompr.nix
+++ b/modules/private/websites/tools/tools/rompr.nix
@@ -53,7 +53,6 @@ rec {
     basedir = builtins.concatStringsSep ":" [ webRoot varDir ];
     socket = "/var/run/phpfpm/rompr.sock";
     pool = ''
-      listen = ${socket}
       user = ${apache.user}
       group = ${apache.group}
       listen.owner = ${apache.user}

diff --git a/modules/private/websites/tools/tools/shaarli.nix b/modules/private/websites/tools/tools/shaarli.nix
index 0f1ae7bcc84f2c4702e0f953fde335b523616232..0a75755950708e4aa39dbe6e59c43eb3bac5258b 100644 (file)
--- a/modules/private/websites/tools/tools/shaarli.nix
+++ b/modules/private/websites/tools/tools/shaarli.nix
@@ -50,7 +50,6 @@ in rec {
     basedir = builtins.concatStringsSep ":" [ webRoot varDir ];
     socket = "/var/run/phpfpm/shaarli.sock";
     pool = ''
-        listen = ${socket}
         user = ${apache.user}
         group = ${apache.group}
         listen.owner = ${apache.user}

diff --git a/modules/private/websites/tools/tools/ttrss.nix b/modules/private/websites/tools/tools/ttrss.nix
index 4a9b8ca46187d3b56a794a59a5a3165e3ea1517f..a8b2a93d63e8e6bbb72d84d62d707033d86de5d8 100644 (file)
--- a/modules/private/websites/tools/tools/ttrss.nix
+++ b/modules/private/websites/tools/tools/ttrss.nix
@@ -116,7 +116,6 @@ rec {
       ++ webRoot.plugins);
     socket = "/var/run/phpfpm/ttrss.sock";
     pool = ''
-      listen = ${socket}
       user = ${apache.user}
       group = ${apache.group}
       listen.owner = ${apache.user}

diff --git a/modules/private/websites/tools/tools/wallabag.nix b/modules/private/websites/tools/tools/wallabag.nix
index 2d152b2c25ece9a00deb043367f358d987e2f2dc..014d8a1acb67da65a753d3dd1d3318a07f4155e1 100644 (file)
--- a/modules/private/websites/tools/tools/wallabag.nix
+++ b/modules/private/websites/tools/tools/wallabag.nix
@@ -131,7 +131,6 @@ rec {
     basedir = builtins.concatStringsSep ":" [ webappDir "/var/secrets/webapps/tools-wallabag" varDir ];
     socket = "/var/run/phpfpm/wallabag.sock";
     pool = ''
-      listen = ${socket}
       user = ${apache.user}
       group = ${apache.group}
       listen.owner = ${apache.user}

diff --git a/modules/private/websites/tools/tools/yourls.nix b/modules/private/websites/tools/tools/yourls.nix
index 6280e78d23af03943040e17ba5c5fe64bdf62f75..466ceae1b857ee919e17a7f0c04e07b6d5e2c9ea 100644 (file)
--- a/modules/private/websites/tools/tools/yourls.nix
+++ b/modules/private/websites/tools/tools/yourls.nix
@@ -75,7 +75,6 @@ rec {
       ++ webRoot.plugins);
     socket = "/var/run/phpfpm/yourls.sock";
     pool = ''
-      listen = ${socket}
       user = ${apache.user}
       group = ${apache.group}
       listen.owner = ${apache.user}