1 files changed, 21 insertions, 24 deletions

diff --git a/modules/private/websites/chloe/builder.nix b/modules/private/websites/chloe/builder.nix
index f21caeb..bce2b4d 100644
--- a/modules/private/websites/chloe/builder.nix
+++ b/modules/private/websites/chloe/builder.nix
@@ -3,28 +3,25 @@ rec {
   app = chloe.override { inherit (config) environment; };
   phpFpm = rec {
     serviceDeps = [ "mysql.service" ];
-    socket = "/var/run/phpfpm/chloe-${app.environment}.sock";
-    pool = ''
-      user = ${apacheUser}
-      group = ${apacheGroup}
-      listen.owner = ${apacheUser}
-      listen.group = ${apacheGroup}
-      php_admin_value[upload_max_filesize] = 20M
-      php_admin_value[post_max_size] = 20M
-      ;php_admin_flag[log_errors] = on
-      php_admin_value[open_basedir] = "${app.spipConfig}:${configDir}:${app}:${app.varDir}:/tmp"
-      php_admin_value[session.save_path] = "${app.varDir}/phpSessions"
-      ${if app.environment == "dev" then ''
-      pm = ondemand
-      pm.max_children = 5
-      pm.process_idle_timeout = 60
-      '' else ''
-      pm = dynamic
-      pm.max_children = 20
-      pm.start_servers = 2
-      pm.min_spare_servers = 1
-      pm.max_spare_servers = 3
-      ''}'';
+    pool = {
+      "listen.owner" = apacheUser;
+      "listen.group" = apacheGroup;
+      "php_admin_value[upload_max_filesize]" = "20M";
+      "php_admin_value[post_max_size]" = "20M";
+      # "php_admin_flag[log_errors]" = "on";
+      "php_admin_value[open_basedir]" = "${app.spipConfig}:${configDir}:${app}:${app.varDir}:/tmp";
+      "php_admin_value[session.save_path]" = "${app.varDir}/phpSessions";
+    } // (if app.environment == "dev" then {
+      "pm" = "ondemand";
+      "pm.max_children" = "5";
+      "pm.process_idle_timeout" = "60";
+    } else {
+      "pm" = "dynamic";
+      "pm.max_children" = "20";
+      "pm.start_servers" = "2";
+      "pm.min_spare_servers" = "1";
+      "pm.max_spare_servers" = "3";
+    });
   };
   keys = [{
     dest = "webapps/${app.environment}-chloe";
@@ -51,7 +48,7 @@ rec {
     modules = [ "proxy_fcgi" ];
     webappName = "chloe_${app.environment}";
     root = "/run/current-system/webapps/${webappName}";
-    vhostConf = ''
+    vhostConf = socket: ''
       Include /var/secrets/webapps/${app.environment}-chloe
 
       RewriteEngine On
@@ -60,7 +57,7 @@ rec {
       '' else ""}
 
       <FilesMatch "\.php$">
-        SetHandler "proxy:unix:${phpFpm.socket}|fcgi://localhost"
+        SetHandler "proxy:unix:${socket}|fcgi://localhost"
       </FilesMatch>
 
       <Directory ${root}>