X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=modules%2Fprivate%2Fwebsites%2Ftools%2Ftools%2Frompr.nix;h=e80d6b2c10bf470a15c41a18aea1204319bc2259;hb=5315b439af1f72c3282549508ae58d86d66e38ec;hp=75adabe5ef09ac9c2719d5e15cddd69b0625d5c3;hpb=441da8aac378f401625e82caf281fa0e26128310;p=perso%2FImmae%2FConfig%2FNix.git

diff --git a/modules/private/websites/tools/tools/rompr.nix b/modules/private/websites/tools/tools/rompr.nix
index 75adabe..e80d6b2 100644
--- a/modules/private/websites/tools/tools/rompr.nix
+++ b/modules/private/websites/tools/tools/rompr.nix
@@ -1,8 +1,5 @@
 { lib, env, rompr }:
 rec {
-  backups = {
-    rootDir = varDir;
-  };
   varDir = "/var/lib/rompr";
   activationScript = ''
     install -m 0755 -o ${apache.user} -g ${apache.group} -d ${varDir} \
@@ -13,9 +10,8 @@ rec {
     user = "wwwrun";
     group = "wwwrun";
     modules = [ "headers" "mime" "proxy_fcgi" ];
-    webappName = "tools_rompr";
-    root = "/run/current-system/webapps/${webappName}";
-    vhostConf = ''
+    root = webRoot;
+    vhostConf = socket: ''
       Alias /rompr ${root}
 
       <Directory ${root}>
@@ -29,7 +25,7 @@ rec {
         AddType image/x-icon .ico
 
         <FilesMatch "\.php$">
-          SetHandler "proxy:unix:${phpFpm.socket}|fcgi://localhost"
+          SetHandler "proxy:unix:${socket}|fcgi://localhost"
         </FilesMatch>
       </Directory>
 
@@ -51,29 +47,26 @@ rec {
   };
   phpFpm = rec {
     basedir = builtins.concatStringsSep ":" [ webRoot varDir ];
-    socket = "/var/run/phpfpm/rompr.sock";
-    pool = ''
-      user = ${apache.user}
-      group = ${apache.group}
-      listen.owner = ${apache.user}
-      listen.group = ${apache.group}
-      pm = ondemand
-      pm.max_children = 60
-      pm.process_idle_timeout = 60
+    pool = {
+      "listen.owner" = apache.user;
+      "listen.group" = apache.group;
+      "pm" = "ondemand";
+      "pm.max_children" = "60";
+      "pm.process_idle_timeout" = "60";
 
-      ; Needed to avoid clashes in browser cookies (same domain)
-      php_value[session.name] = RomprPHPSESSID
-      php_admin_value[open_basedir] = "${basedir}:/tmp"
-      php_admin_value[session.save_path] = "${varDir}/phpSessions"
-      php_flag[magic_quotes_gpc] = Off
-      php_flag[track_vars] = On
-      php_flag[register_globals] = Off
-      php_admin_flag[allow_url_fopen] = On
-      php_value[include_path] = ${webRoot}
-      php_admin_value[upload_tmp_dir] = "${varDir}/prefs"
-      php_admin_value[post_max_size] = 32M
-      php_admin_value[upload_max_filesize] = 32M
-      php_admin_value[memory_limit] = 256M
-      '';
+      # Needed to avoid clashes in browser cookies (same domain)
+      "php_value[session.name]" = "RomprPHPSESSID";
+      "php_admin_value[open_basedir]" = "${basedir}:/tmp";
+      "php_admin_value[session.save_path]" = "${varDir}/phpSessions";
+      "php_flag[magic_quotes_gpc]" = "Off";
+      "php_flag[track_vars]" = "On";
+      "php_flag[register_globals]" = "Off";
+      "php_admin_flag[allow_url_fopen]" = "On";
+      "php_value[include_path]" = "${webRoot}";
+      "php_admin_value[upload_tmp_dir]" = "${varDir}/prefs";
+      "php_admin_value[post_max_size]" = "32M";
+      "php_admin_value[upload_max_filesize]" = "32M";
+      "php_admin_value[memory_limit]" = "256M";
+    };
   };
 }