aboutsummaryrefslogtreecommitdiff
path: root/modules/private/websites/tools/mail
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/mail
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/mail')
-rw-r--r--modules/private/websites/tools/mail/default.nix5
-rw-r--r--modules/private/websites/tools/mail/rainloop.nix1
2 files changed, 3 insertions, 3 deletions
diff --git a/modules/private/websites/tools/mail/default.nix b/modules/private/websites/tools/mail/default.nix
index 6342694..bb36042 100644
--- a/modules/private/websites/tools/mail/default.nix
+++ b/modules/private/websites/tools/mail/default.nix
@@ -60,8 +60,9 @@ in
60 extraConfig = roundcubemail.phpFpm.pool; 60 extraConfig = roundcubemail.phpFpm.pool;
61 phpOptions = config.services.phpfpm.phpOptions + roundcubemail.phpFpm.phpConfig; 61 phpOptions = config.services.phpfpm.phpOptions + roundcubemail.phpFpm.phpConfig;
62 }; 62 };
63 services.phpfpm.poolConfigs = { 63 services.phpfpm.pools.rainloop = {
64 rainloop = rainloop.phpFpm.pool; 64 listen = rainloop.phpFpm.socket;
65 extraConfig = rainloop.phpFpm.pool;
65 }; 66 };
66 system.activationScripts = { 67 system.activationScripts = {
67 roundcubemail = roundcubemail.activationScript; 68 roundcubemail = roundcubemail.activationScript;
diff --git a/modules/private/websites/tools/mail/rainloop.nix b/modules/private/websites/tools/mail/rainloop.nix
index dbf0f24..2dad46e 100644
--- a/modules/private/websites/tools/mail/rainloop.nix
+++ b/modules/private/websites/tools/mail/rainloop.nix
@@ -39,7 +39,6 @@ rec {
39 basedir = builtins.concatStringsSep ":" [ webRoot varDir ]; 39 basedir = builtins.concatStringsSep ":" [ webRoot varDir ];
40 socket = "/var/run/phpfpm/rainloop.sock"; 40 socket = "/var/run/phpfpm/rainloop.sock";
41 pool = '' 41 pool = ''
42 listen = ${socket}
43 user = ${apache.user} 42 user = ${apache.user}
44 group = ${apache.group} 43 group = ${apache.group}
45 listen.owner = ${apache.user} 44 listen.owner = ${apache.user}