aboutsummaryrefslogtreecommitdiff
path: root/modules/private/websites/tools/git
diff options
context:
space:
mode:
authorIsmaël Bouya <ismael.bouya@normalesup.org>2020-03-30 23:54:00 +0200
committerIsmaël Bouya <ismael.bouya@normalesup.org>2020-03-30 23:54:00 +0200
commit441da8aac378f401625e82caf281fa0e26128310 (patch)
tree954ff4c76ac748a63426f7dddabd0af2407fee92 /modules/private/websites/tools/git
parent9a45867fbe3fc0c777a92f19d953b831deaec09d (diff)
downloadNix-441da8aac378f401625e82caf281fa0e26128310.tar.gz
Nix-441da8aac378f401625e82caf281fa0e26128310.tar.zst
Nix-441da8aac378f401625e82caf281fa0e26128310.zip
Use pools instead of deprecated poolConfigs for php
Diffstat (limited to 'modules/private/websites/tools/git')
-rw-r--r--modules/private/websites/tools/git/default.nix7
-rw-r--r--modules/private/websites/tools/git/mantisbt.nix1
2 files changed, 5 insertions, 3 deletions
diff --git a/modules/private/websites/tools/git/default.nix b/modules/private/websites/tools/git/default.nix
index a5f525b..054e47b 100644
--- a/modules/private/websites/tools/git/default.nix
+++ b/modules/private/websites/tools/git/default.nix
@@ -38,8 +38,11 @@ in {
38 '' 38 ''
39 ]; 39 ];
40 }; 40 };
41 services.phpfpm.poolConfigs = { 41 services.phpfpm.pools = {
42 mantisbt = mantisbt.phpFpm.pool; 42 mantisbt = {
43 listen = mantisbt.phpFpm.socket;
44 extraConfig = mantisbt.phpFpm.pool;
45 };
43 }; 46 };
44 }; 47 };
45} 48}
diff --git a/modules/private/websites/tools/git/mantisbt.nix b/modules/private/websites/tools/git/mantisbt.nix
index 8606819..d75b022 100644
--- a/modules/private/websites/tools/git/mantisbt.nix
+++ b/modules/private/websites/tools/git/mantisbt.nix
@@ -78,7 +78,6 @@ rec {
78 ++ webRoot.plugins); 78 ++ webRoot.plugins);
79 socket = "/var/run/phpfpm/mantisbt.sock"; 79 socket = "/var/run/phpfpm/mantisbt.sock";
80 pool = '' 80 pool = ''
81 listen = ${socket}
82 user = ${apache.user} 81 user = ${apache.user}
83 group = ${apache.group} 82 group = ${apache.group}
84 listen.owner = ${apache.user} 83 listen.owner = ${apache.user}