Upgrade nixos

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

diff --git a/modules/private/websites/evariste/production.nix b/modules/private/websites/evariste/production.nix
index 00e6fe186b7ece792910291760a6a8910177def1..43b26c809e70e0653a07dcb109c43bd0024e2699 100644 (file)
--- a/modules/private/websites/evariste/production.nix
+++ b/modules/private/websites/evariste/production.nix
@@ -21,20 +21,19 @@ in {
         '';
     };
     services.phpfpm.pools.nsievariste = {
-      listen = "/run/phpfpm/nsievariste.sock";
-      extraConfig = ''
-        user = wwwrun
-        group = wwwrun
-        listen.owner = wwwrun
-        listen.group = wwwrun
+      user = "wwwrun";
+      group = "wwwrun";
+      settings = {
+        "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] = "/var/lib/php/sessions/nsievariste:${nsiVarDir}:/tmp"
-        php_admin_value[session.save_path] = "/var/lib/php/sessions/nsievariste"
-        '';
+        "php_admin_value[open_basedir]" = "/var/lib/php/sessions/nsievariste:${nsiVarDir}:/tmp";
+        "php_admin_value[session.save_path]" = "/var/lib/php/sessions/nsievariste";
+      };
     };
     services.websites.env.production.vhostConfs.nsievariste = {
       certName     = "eldiron";
@@ -46,7 +45,7 @@ in {
         Use Stats nsievariste.immae.eu
 
         <FilesMatch "\.php$">
-          SetHandler "proxy:unix:/run/phpfpm/nsievariste.sock|fcgi://localhost"
+          SetHandler "proxy:unix:${config.services.phpfpm.pools.nsievariste.socket}|fcgi://localhost"
         </FilesMatch>
 
         <Directory ${nsiVarDir}>
@@ -60,20 +59,19 @@ in {
     };
 
     services.phpfpm.pools.stmgevariste = {
-      listen = "/run/phpfpm/stmgevariste.sock";
-      extraConfig = ''
-        user = wwwrun
-        group = wwwrun
-        listen.owner = wwwrun
-        listen.group = wwwrun
+      user = "wwwrun";
+      group = "wwwrun";
+      settings = {
+        "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] = "/var/lib/php/sessions/stmgevariste:${stmgVarDir}:/tmp"
-        php_admin_value[session.save_path] = "/var/lib/php/sessions/stmgevariste"
-        '';
+        "php_admin_value[open_basedir]" = "/var/lib/php/sessions/stmgevariste:${stmgVarDir}:/tmp";
+        "php_admin_value[session.save_path]" = "/var/lib/php/sessions/stmgevariste";
+      };
     };
     services.websites.env.production.vhostConfs.stmgevariste = {
       certName     = "eldiron";
@@ -85,7 +83,7 @@ in {
         Use Stats stmgevariste.immae.eu
 
         <FilesMatch "\.php$">
-          SetHandler "proxy:unix:/run/phpfpm/stmgevariste.sock|fcgi://localhost"
+          SetHandler "proxy:unix:${config.services.phpfpm.pools.stmgevariste.socket}|fcgi://localhost"
         </FilesMatch>
 
         <Directory ${stmgVarDir}>