X-Git-Url: https://git.immae.eu/?p=perso%2FImmae%2FConfig%2FNix.git;a=blobdiff_plain;f=modules%2Fprivate%2Fwebsites%2Ftools%2Ftools%2Fdefault.nix;h=5e0d4460ae936c4f7ce33191cba52157716530ac;hp=5dc0981ef627e979523ad7d6a7c8fd6a55aa61cb;hb=5400b9b6f65451d41a9106fae6fc00f97d83f4ef;hpb=441da8aac378f401625e82caf281fa0e26128310

diff --git a/modules/private/websites/tools/tools/default.nix b/modules/private/websites/tools/tools/default.nix
index 5dc0981..5e0d446 100644
--- a/modules/private/websites/tools/tools/default.nix
+++ b/modules/private/websites/tools/tools/default.nix
@@ -40,6 +40,7 @@ let
   };
 
   cfg = config.myServices.websites.tools.tools;
+  pcfg = config.services.phpfpm.pools;
 in {
   options.myServices.websites.tools.tools = {
     enable = lib.mkEnableOption "enable tools website";
@@ -92,7 +93,7 @@ in {
             AllowOverride all
             Require all granted
             <FilesMatch "\.php$">
-              SetHandler "proxy:unix:/var/run/phpfpm/devtools.sock|fcgi://localhost"
+              SetHandler "proxy:unix:${pcfg.devtools.socket}|fcgi://localhost"
             </FilesMatch>
           </Directory>
           ''
@@ -115,21 +116,21 @@ in {
             AllowOverride all
             Require all granted
             <FilesMatch "\.php$">
-              SetHandler "proxy:unix:/var/run/phpfpm/tools.sock|fcgi://localhost"
+              SetHandler "proxy:unix:${pcfg.tools.socket}|fcgi://localhost"
             </FilesMatch>
           </Directory>
           ''
-        adminer.apache.vhostConf
+        (adminer.apache.vhostConf pcfg.adminer.socket)
         ympd.apache.vhostConf
-        ttrss.apache.vhostConf
-        wallabag.apache.vhostConf
-        yourls.apache.vhostConf
-        rompr.apache.vhostConf
-        shaarli.apache.vhostConf
-        dokuwiki.apache.vhostConf
-        ldap.apache.vhostConf
-        kanboard.apache.vhostConf
-        grocy.apache.vhostConf
+        (ttrss.apache.vhostConf pcfg.ttrss.socket)
+        (wallabag.apache.vhostConf pcfg.wallabag.socket)
+        (yourls.apache.vhostConf pcfg.yourls.socket)
+        (rompr.apache.vhostConf pcfg.rompr.socket)
+        (shaarli.apache.vhostConf pcfg.shaarli.socket)
+        (dokuwiki.apache.vhostConf pcfg.dokuwiki.socket)
+        (ldap.apache.vhostConf pcfg.ldap.socket)
+        (kanboard.apache.vhostConf pcfg.kanboard.socket)
+        (grocy.apache.vhostConf pcfg.grocy.socket)
       ];
     };
 
@@ -226,38 +227,36 @@ in {
 
     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
+        user = "wwwrun";
+        group = "wwwrun";
+        settings = {
+          "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"
-          '';
+          # 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
+        user = "wwwrun";
+        group = "wwwrun";
+        settings = {
+          "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"
-          '';
+          "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
@@ -265,45 +264,51 @@ in {
           zend_extension=${pkgs.php}/lib/php/extensions/opcache.so
           '';
       };
-      adminer = {
-        listen = adminer.phpFpm.socket;
-        extraConfig = adminer.phpFpm.pool;
-      };
+      adminer = adminer.phpFpm;
       ttrss = {
-        listen = ttrss.phpFpm.socket;
-        extraConfig = ttrss.phpFpm.pool;
+        user = "wwwrun";
+        group = "wwwrun";
+        settings = ttrss.phpFpm.pool;
       };
       wallabag = {
-        listen = wallabag.phpFpm.socket;
-        extraConfig = wallabag.phpFpm.pool;
+        user = "wwwrun";
+        group = "wwwrun";
+        settings = wallabag.phpFpm.pool;
       };
       yourls = {
-        listen = yourls.phpFpm.socket;
-        extraConfig = yourls.phpFpm.pool;
+        user = "wwwrun";
+        group = "wwwrun";
+        settings = yourls.phpFpm.pool;
       };
       rompr = {
-        listen = rompr.phpFpm.socket;
-        extraConfig = rompr.phpFpm.pool;
+        user = "wwwrun";
+        group = "wwwrun";
+        settings = rompr.phpFpm.pool;
       };
       shaarli = {
-        listen = shaarli.phpFpm.socket;
-        extraConfig = shaarli.phpFpm.pool;
+        user = "wwwrun";
+        group = "wwwrun";
+        settings = shaarli.phpFpm.pool;
       };
       dokuwiki = {
-        listen = dokuwiki.phpFpm.socket;
-        extraConfig = dokuwiki.phpFpm.pool;
+        user = "wwwrun";
+        group = "wwwrun";
+        settings = dokuwiki.phpFpm.pool;
       };
       ldap = {
-        listen = ldap.phpFpm.socket;
-        extraConfig = ldap.phpFpm.pool;
+        user = "wwwrun";
+        group = "wwwrun";
+        settings = ldap.phpFpm.pool;
       };
       kanboard = {
-        listen = kanboard.phpFpm.socket;
-        extraConfig = kanboard.phpFpm.pool;
+        user = "wwwrun";
+        group = "wwwrun";
+        settings = kanboard.phpFpm.pool;
       };
       grocy = {
-        listen = grocy.phpFpm.socket;
-        extraConfig = grocy.phpFpm.pool;
+        user = "wwwrun";
+        group = "wwwrun";
+        settings = grocy.phpFpm.pool;
       };
     };