X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=modules%2Fprivate%2Fwebsites%2Ftools%2Fgit%2Fmantisbt.nix;h=50851aa5677dd33d2d0adeee8c5fe5509c800d40;hb=5400b9b6f65451d41a9106fae6fc00f97d83f4ef;hp=d0d7a9887d7baaa5d42abcae0d413245edd17c72;hpb=ab8f306d7c2c49b8116e1af7b355ed2384617ed9;p=perso%2FImmae%2FConfig%2FNix.git

diff --git a/modules/private/websites/tools/git/mantisbt.nix b/modules/private/websites/tools/git/mantisbt.nix
index d0d7a98..50851aa 100644
--- a/modules/private/websites/tools/git/mantisbt.nix
+++ b/modules/private/websites/tools/git/mantisbt.nix
@@ -31,7 +31,7 @@ rec {
       $g_from_email		= 'mantisbt@tools.immae.eu';
       $g_return_path_email	= 'mantisbt@tools.immae.eu';
       $g_from_name		= 'Mantis Bug Tracker at git.immae.eu';
-      $g_email_receive_own	= OFF;
+      $g_email_receive_own	= ON;
       # --- LDAP ---
       $g_login_method = LDAP;
       $g_ldap_protocol_version = 3;
@@ -53,12 +53,12 @@ rec {
     modules = [ "proxy_fcgi" ];
     webappName = "tools_mantisbt";
     root = "/run/current-system/webapps/${webappName}";
-    vhostConf = ''
+    vhostConf = socket: ''
       Alias /mantisbt "${root}"
       <Directory "${root}">
         DirectoryIndex index.php
         <FilesMatch "\.php$">
-          SetHandler "proxy:unix:${phpFpm.socket}|fcgi://localhost"
+          SetHandler "proxy:unix:${socket}|fcgi://localhost"
         </FilesMatch>
 
         AllowOverride All
@@ -76,21 +76,17 @@ rec {
     basedir = builtins.concatStringsSep ":" (
       [ webRoot "/var/secrets/webapps/tools-mantisbt" ]
       ++ webRoot.plugins);
-    socket = "/var/run/phpfpm/mantisbt.sock";
-    pool = ''
-      listen = ${socket}
-      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";
 
-      php_admin_value[upload_max_filesize] = 5000000
+      "php_admin_value[upload_max_filesize]" = "5000000";
 
-      php_admin_value[open_basedir] = "${basedir}:/tmp:/var/lib/php/sessions/mantisbt"
-      php_admin_value[session.save_path] = "/var/lib/php/sessions/mantisbt"
-      '';
+      "php_admin_value[open_basedir]" = "${basedir}:/tmp:/var/lib/php/sessions/mantisbt";
+      "php_admin_value[session.save_path]" = "/var/lib/php/sessions/mantisbt";
+    };
   };
 }