From 44477523519b40d92c743c30792e1ca8c7bcc83b Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Tue, 15 Oct 2019 14:26:50 +0200
Subject: ma nginx/euer.wiki: poolConfigs -> pools

---
 makefu/2configs/nginx/euer.wiki.nix | 26 ++++++++++++--------------
 1 file changed, 12 insertions(+), 14 deletions(-)

(limited to 'makefu/2configs/nginx/euer.wiki.nix')

diff --git a/makefu/2configs/nginx/euer.wiki.nix b/makefu/2configs/nginx/euer.wiki.nix
index 732c2778..56f44f9a 100644
--- a/makefu/2configs/nginx/euer.wiki.nix
+++ b/makefu/2configs/nginx/euer.wiki.nix
@@ -23,20 +23,18 @@ let
 in {
   state = [ base-dir ];
   services.phpfpm = {
-    # phpfpm does not have an enable option
-    poolConfigs  = {
-      euer-wiki = ''
-        user =  ${user}
-        group =  ${group}
-        listen = ${fpm-socket}
-        listen.owner = ${user}
-        listen.group = ${group}
-        env[twconf] = ${base-cfg};
-        pm = dynamic
-        pm.max_children = 5
-        pm.start_servers = 2
-        pm.min_spare_servers = 1
-        pm.max_spare_servers = 3
+    pools.euer-wiki = {
+      inherit user group;
+      listen = fpm-socket;
+      config = {
+        "pm" = "dynamic";
+        "pm.max_children" = 5;
+        "pm.start_servers" = 2;
+        "pm.min_spare_servers" = 1;
+        "pm.max_spare_servers" = 3;
+      };
+      phpEnv.twconf = base-cfg;
+      extraConfig = ''
         chdir = /
         php_admin_value[error_log] = 'stderr'
         php_admin_flag[log_errors] = on
-- 
cgit v1.2.3


From 0116beb65839f61763d4e3e6bf9ba381de02435b Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Tue, 15 Oct 2019 21:42:57 +0200
Subject: ma nginx/euer.wiki: use settings instead of extraConfig all the way
 down

---
 makefu/2configs/nginx/euer.wiki.nix | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

(limited to 'makefu/2configs/nginx/euer.wiki.nix')

diff --git a/makefu/2configs/nginx/euer.wiki.nix b/makefu/2configs/nginx/euer.wiki.nix
index 56f44f9a..a6766eee 100644
--- a/makefu/2configs/nginx/euer.wiki.nix
+++ b/makefu/2configs/nginx/euer.wiki.nix
@@ -26,20 +26,19 @@ in {
     pools.euer-wiki = {
       inherit user group;
       listen = fpm-socket;
-      config = {
+      settings = {
         "pm" = "dynamic";
         "pm.max_children" = 5;
         "pm.start_servers" = 2;
         "pm.min_spare_servers" = 1;
         "pm.max_spare_servers" = 3;
+        "chdir" = "/";
+        "php_admin_value[error_log]" = "stderr";
+        "php_admin_flag[log_errors]" = "on";
+        "catch_workers_output" = "yes";
+
       };
       phpEnv.twconf = base-cfg;
-      extraConfig = ''
-        chdir = /
-        php_admin_value[error_log] = 'stderr'
-        php_admin_flag[log_errors] = on
-        catch_workers_output = yes
-      '';
     };
   };
 
-- 
cgit v1.2.3