X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=modules%2Fprivate%2Fwebsites%2Ftools%2Ftools%2Fkanboard.nix;h=0f6fefc7a67009e259662c3152585ac808a03e3c;hb=0c67c58418d0b69135109765226e31137bd13c0a;hp=68c3a1081c530fdb01ffe58f805668025c72a97e;hpb=6a8252b11bb02f3e67857d5a9d733b1affa6a625;p=perso%2FImmae%2FConfig%2FNix.git
diff --git a/modules/private/websites/tools/tools/kanboard.nix b/modules/private/websites/tools/tools/kanboard.nix
index 68c3a10..0f6fefc 100644
--- 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}');
?>
'';
}];
@@ -49,7 +49,7 @@ rec {
modules = [ "proxy_fcgi" ];
webappName = "tools_kanboard";
root = "/run/current-system/webapps/${webappName}";
- vhostConf = ''
+ vhostConf = socket: ''
Alias /kanboard "${root}"
DirectoryIndex index.php
@@ -58,7 +58,7 @@ rec {
Require all granted
- SetHandler "proxy:unix:${phpFpm.socket}|fcgi://localhost"
+ SetHandler "proxy:unix:${socket}|fcgi://localhost"
@@ -69,21 +69,17 @@ rec {
phpFpm = rec {
serviceDeps = [ "postgresql.service" "openldap.service" ];
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}
- 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] = KanboardPHPSESSID
- php_admin_value[open_basedir] = "${basedir}:/tmp"
- php_admin_value[session.save_path] = "${varDir}/phpSessions"
- '';
+ # Needed to avoid clashes in browser cookies (same domain)
+ "php_value[session.name]" = "KanboardPHPSESSID";
+ "php_admin_value[open_basedir]" = "${basedir}:/tmp";
+ "php_admin_value[session.save_path]" = "${varDir}/phpSessions";
+ };
};
}