Merge remote-tracking branch 'lass/19.09' into 19.09

1 files changed, 52 insertions, 46 deletions

diff --git a/lass/2configs/websites/util.nix b/lass/2configs/websites/util.nix
index a807f7160..bffa1036b 100644
--- a/lass/2configs/websites/util.nix
+++ b/lass/2configs/websites/util.nix
@@ -60,21 +60,23 @@ rec {
           expires max;
         '';
       };
-      services.phpfpm.poolConfigs."${domain}" = ''
-        listen = /srv/http/${domain}/phpfpm.pool
-        user = nginx
-        group = nginx
-        pm = dynamic
-        pm.max_children = 25
-        pm.start_servers = 5
-        pm.min_spare_servers = 3
-        pm.max_spare_servers = 20
-        listen.owner = nginx
-        listen.group = nginx
-        php_admin_value[error_log] = 'stderr'
-        php_admin_flag[log_errors] = on
-        catch_workers_output = yes
-      '';
+      services.phpfpm.pools."${domain}" = {
+        user = "nginx";
+        group = "nginx";
+        extraConfig = ''
+          listen = /srv/http/${domain}/phpfpm.pool
+          pm = dynamic
+          pm.max_children = 25
+          pm.start_servers = 5
+          pm.min_spare_servers = 3
+          pm.max_spare_servers = 20
+          listen.owner = nginx
+          listen.group = nginx
+          php_admin_value[error_log] = 'stderr'
+          php_admin_flag[log_errors] = on
+          catch_workers_output = yes
+        '';
+      };
     };
 
   serveOwncloud = domains:
@@ -169,22 +171,24 @@ rec {
           access_log off;
         '';
       };
-      services.phpfpm.poolConfigs."${domain}" = ''
-        listen = /srv/http/${domain}/phpfpm.pool
-        user = nginx
-        group = nginx
-        pm = dynamic
-        pm.max_children = 32
-        pm.max_requests = 500
-        pm.start_servers = 2
-        pm.min_spare_servers = 2
-        pm.max_spare_servers = 5
-        listen.owner = nginx
-        listen.group = nginx
-        php_admin_value[error_log] = 'stderr'
-        php_admin_flag[log_errors] = on
-        catch_workers_output = yes
-      '';
+      services.phpfpm.pools."${domain}" = {
+        user = "nginx";
+        group = "nginx";
+        extraConfig = ''
+          listen = /srv/http/${domain}/phpfpm.pool
+          pm = dynamic
+          pm.max_children = 32
+          pm.max_requests = 500
+          pm.start_servers = 2
+          pm.min_spare_servers = 2
+          pm.max_spare_servers = 5
+          listen.owner = nginx
+          listen.group = nginx
+          php_admin_value[error_log] = 'stderr'
+          php_admin_flag[log_errors] = on
+          catch_workers_output = yes
+        '';
+      };
     };
 
   serveWordpress = domains:
@@ -220,21 +224,23 @@ rec {
           expires max;
         '';
       };
-      services.phpfpm.poolConfigs."${domain}" = ''
-        listen = /srv/http/${domain}/phpfpm.pool
-        user = nginx
-        group = nginx
-        pm = dynamic
-        pm.max_children = 25
-        pm.start_servers = 5
-        pm.min_spare_servers = 3
-        pm.max_spare_servers = 20
-        listen.owner = nginx
-        listen.group = nginx
-        php_admin_value[error_log] = 'stderr'
-        php_admin_flag[log_errors] = on
-        catch_workers_output = yes
-      '';
+      services.phpfpm.pools."${domain}" = {
+        user = "nginx";
+        group = "nginx";
+        extraConfig = ''
+          listen = /srv/http/${domain}/phpfpm.pool
+          pm = dynamic
+          pm.max_children = 25
+          pm.start_servers = 5
+          pm.min_spare_servers = 3
+          pm.max_spare_servers = 20
+          listen.owner = nginx
+          listen.group = nginx
+          php_admin_value[error_log] = 'stderr'
+          php_admin_flag[log_errors] = on
+          catch_workers_output = yes
+        '';
+      };
     };
 
 }