Use pools instead of deprecated poolConfigs for php

[perso/Immae/Config/Nix.git] / modules / private / websites / tools / git / mantisbt.nix

diff --git a/modules/private/websites/tools/git/mantisbt.nix b/modules/private/websites/tools/git/mantisbt.nix
index a1b830ebd655be80d98fb95134265a83531a0148..d75b022d74b4c7364208232e4539ee0443de7dd4 100644 (file)
--- a/modules/private/websites/tools/git/mantisbt.nix
+++ b/modules/private/websites/tools/git/mantisbt.nix
@@ -31,19 +31,19 @@ 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;
-      $g_ldap_server = 'ldaps://ldap.immae.eu:636';
-      $g_ldap_root_dn = 'ou=users,dc=immae,dc=eu';
-      $g_ldap_bind_dn = 'cn=mantisbt,ou=services,dc=immae,dc=eu';
+      $g_ldap_server = 'ldaps://${env.ldap.host}:636';
+      $g_ldap_root_dn = 'ou=users,${env.ldap.base}';
+      $g_ldap_bind_dn = '${env.ldap.dn}';
       $g_ldap_bind_passwd = '${env.ldap.password}';
       $g_use_ldap_email = ON;
       $g_use_ldap_realname = ON;
       $g_ldap_uid_field = 'uid';
       $g_ldap_realname_field = 'cn';
-      $g_ldap_organization = '(memberOf=cn=users,cn=mantisbt,ou=services,dc=immae,dc=eu)';
+      $g_ldap_organization = '${env.ldap.filter}';
     '';
   }];
   webRoot = (mantisbt_2.override { mantis_config = "/var/secrets/webapps/tools-mantisbt"; }).withPlugins (builtins.attrValues mantisbt_2-plugins);
@@ -78,7 +78,6 @@ rec {
       ++ webRoot.plugins);
     socket = "/var/run/phpfpm/mantisbt.sock";
     pool = ''
-      listen = ${socket}
       user = ${apache.user}
       group = ${apache.group}
       listen.owner = ${apache.user}