X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=modules%2Fprivate%2Fwebsites%2Ftools%2Ftools%2Fkanboard.nix;h=db39ecdcb087f7047dc9b12667392308f1bc8c2d;hb=bbea22c02b6c059a6be1064391f06737ee244ba6;hp=36a949c4e33e2499188738b7b80ab3573b68d110;hpb=ab8f306d7c2c49b8116e1af7b355ed2384617ed9;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 36a949c..db39ecd 100644
--- a/modules/private/websites/tools/tools/kanboard.nix
+++ b/modules/private/websites/tools/tools/kanboard.nix
@@ -1,56 +1,51 @@
-{ env, kanboard }:
+{ env, kanboard, config }:
rec {
- backups = {
- rootDir = varDir;
- };
varDir = "/var/lib/kanboard";
activationScript = {
deps = [ "wrappers" ];
text = ''
install -m 0755 -o ${apache.user} -g ${apache.group} -d ${varDir}/data
- install -m 0750 -o ${apache.user} -g ${apache.group} -d ${varDir}/phpSessions
install -TDm644 ${webRoot}/dataold/.htaccess ${varDir}/data/.htaccess
install -TDm644 ${webRoot}/dataold/web.config ${varDir}/data/web.config
'';
};
- keys = [{
- dest = "webapps/tools-kanboard";
+ keys."webapps/tools-kanboard" = {
user = apache.user;
group = apache.group;
permissions = "0400";
text = ''
-
+ SetEnv LDAP_BIND_TYPE "proxy"
+ SetEnv LDAP_USERNAME "${env.ldap.dn}"
+ SetEnv LDAP_PASSWORD "${env.ldap.password}"
+ SetEnv LDAP_USER_BASE_DN "${env.ldap.base}"
+ SetEnv LDAP_USER_FILTER "${env.ldap.filter}"
+ SetEnv LDAP_GROUP_ADMIN_DN "${env.ldap.admin_dn}"
'';
- }];
- webRoot = kanboard { kanboard_config = "/var/secrets/webapps/tools-kanboard"; };
+ };
+ webRoot = kanboard;
apache = rec {
user = "wwwrun";
group = "wwwrun";
modules = [ "proxy_fcgi" ];
- webappName = "tools_kanboard";
- root = "/run/current-system/webapps/${webappName}";
- vhostConf = ''
+ root = webRoot;
+ vhostConf = socket: ''
Alias /kanboard "${root}"
+
+ Include ${config.secrets.fullPaths."webapps/tools-kanboard"}
+
DirectoryIndex index.php
AllowOverride All
@@ -58,7 +53,7 @@ rec {
Require all granted
- SetHandler "proxy:unix:${phpFpm.socket}|fcgi://localhost"
+ SetHandler "proxy:unix:${socket}|fcgi://localhost"
@@ -68,22 +63,19 @@ 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
+ basedir = builtins.concatStringsSep ":" [ webRoot varDir ];
+ 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_handler]" = "redis";
+ "php_admin_value[session.save_path]" = "'unix:///run/redis-php-sessions/redis.sock?persistent=1&prefix=Tools:Kanboard:'";
+ };
};
}