aboutsummaryrefslogtreecommitdiff
path: root/modules/private/tasks/default.nix
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/tasks/default.nix
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/tasks/default.nix')
-rw-r--r--modules/private/tasks/default.nix36
1 files changed, 19 insertions, 17 deletions
diff --git a/modules/private/tasks/default.nix b/modules/private/tasks/default.nix
index c0cc87b..78e07c1 100644
--- a/modules/private/tasks/default.nix
+++ b/modules/private/tasks/default.nix
@@ -170,24 +170,26 @@ in {
170 </Location> 170 </Location>
171 '') env.taskwarrior-web); 171 '') env.taskwarrior-web);
172 }; 172 };
173 services.phpfpm.poolConfigs = { 173 services.phpfpm.pools = {
174 tasks = '' 174 tasks = {
175 listen = /var/run/phpfpm/task.sock 175 listen = "/var/run/phpfpm/task.sock";
176 user = ${user} 176 extraConfig = ''
177 group = ${group} 177 user = ${user}
178 listen.owner = wwwrun 178 group = ${group}
179 listen.group = wwwrun 179 listen.owner = wwwrun
180 pm = dynamic 180 listen.group = wwwrun
181 pm.max_children = 60 181 pm = dynamic
182 pm.start_servers = 2 182 pm.max_children = 60
183 pm.min_spare_servers = 1 183 pm.start_servers = 2
184 pm.max_spare_servers = 10 184 pm.min_spare_servers = 1
185 pm.max_spare_servers = 10
185 186
186 ; Needed to avoid clashes in browser cookies (same domain) 187 ; Needed to avoid clashes in browser cookies (same domain)
187 env[PATH] = "/etc/profiles/per-user/${user}/bin" 188 env[PATH] = "/etc/profiles/per-user/${user}/bin"
188 php_value[session.name] = TaskPHPSESSID 189 php_value[session.name] = TaskPHPSESSID
189 php_admin_value[open_basedir] = "${./www}:/tmp:${server_vardir}:/etc/profiles/per-user/${user}/bin/" 190 php_admin_value[open_basedir] = "${./www}:/tmp:${server_vardir}:/etc/profiles/per-user/${user}/bin/"
190 ''; 191 '';
192 };
191 }; 193 };
192 194
193 myServices.websites.webappDirs._task = ./www; 195 myServices.websites.webappDirs._task = ./www;