Use pools instead of deprecated poolConfigs for php

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

diff --git a/modules/private/websites/tools/tools/kanboard.nix b/modules/private/websites/tools/tools/kanboard.nix
index 68c3a1081c530fdb01ffe58f805668025c72a97e..1880cbd27d98af8e49416c4bcbc247e2fa28900b 100644 (file)
--- a/modules/private/websites/tools/tools/kanboard.nix
+++ b/modules/private/websites/tools/tools/kanboard.nix
@@ -37,8 +37,8 @@ rec {
       define('LDAP_USERNAME', '${env.ldap.dn}');
       define('LDAP_PASSWORD', '${env.ldap.password}');
       define('LDAP_USER_BASE_DN', '${env.ldap.base}');
-      define('LDAP_USER_FILTER', '(&(memberOf=cn=users,cn=kanboard,ou=services,dc=immae,dc=eu)(uid=%s))');
-      define('LDAP_GROUP_ADMIN_DN', 'cn=admins,cn=kanboard,ou=services,dc=immae,dc=eu');
+      define('LDAP_USER_FILTER', '${env.ldap.filter}');
+      define('LDAP_GROUP_ADMIN_DN', '${env.ldap.admin_dn}');
       ?>
       '';
   }];
@@ -71,7 +71,6 @@ rec {
     basedir = builtins.concatStringsSep ":" [ webRoot varDir "/var/secrets/webapps/tools-kanboard" ];
     socket = "/var/run/phpfpm/kanboard.sock";
     pool = ''
-      listen = ${socket}
       user = ${apache.user}
       group = ${apache.group}
       listen.owner = ${apache.user}