diff options
author | Ismaël Bouya <ismael.bouya@normalesup.org> | 2020-03-30 23:54:00 +0200 |
---|---|---|
committer | Ismaël Bouya <ismael.bouya@normalesup.org> | 2020-03-30 23:54:00 +0200 |
commit | 441da8aac378f401625e82caf281fa0e26128310 (patch) | |
tree | 954ff4c76ac748a63426f7dddabd0af2407fee92 /modules/private/websites/tools/dav | |
parent | 9a45867fbe3fc0c777a92f19d953b831deaec09d (diff) | |
download | Nix-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/dav')
-rw-r--r-- | modules/private/websites/tools/dav/davical.nix | 1 | ||||
-rw-r--r-- | modules/private/websites/tools/dav/default.nix | 7 |
2 files changed, 5 insertions, 3 deletions
diff --git a/modules/private/websites/tools/dav/davical.nix b/modules/private/websites/tools/dav/davical.nix index 2a02f5e..5eb3fab 100644 --- a/modules/private/websites/tools/dav/davical.nix +++ b/modules/private/websites/tools/dav/davical.nix | |||
@@ -113,7 +113,6 @@ rec { | |||
113 | basedir = builtins.concatStringsSep ":" [ webapp "/var/secrets/webapps/dav-davical" awl ]; | 113 | basedir = builtins.concatStringsSep ":" [ webapp "/var/secrets/webapps/dav-davical" awl ]; |
114 | socket = "/var/run/phpfpm/davical.sock"; | 114 | socket = "/var/run/phpfpm/davical.sock"; |
115 | pool = '' | 115 | pool = '' |
116 | listen = ${socket} | ||
117 | user = ${apache.user} | 116 | user = ${apache.user} |
118 | group = ${apache.group} | 117 | group = ${apache.group} |
119 | listen.owner = ${apache.user} | 118 | listen.owner = ${apache.user} |
diff --git a/modules/private/websites/tools/dav/default.nix b/modules/private/websites/tools/dav/default.nix index c74930a..0012965 100644 --- a/modules/private/websites/tools/dav/default.nix +++ b/modules/private/websites/tools/dav/default.nix | |||
@@ -42,8 +42,11 @@ in { | |||
42 | ]; | 42 | ]; |
43 | }; | 43 | }; |
44 | 44 | ||
45 | services.phpfpm.poolConfigs = { | 45 | services.phpfpm.pools = { |
46 | davical = davical.phpFpm.pool; | 46 | davical = { |
47 | listen = davical.phpFpm.socket; | ||
48 | extraConfig = davical.phpFpm.pool; | ||
49 | }; | ||
47 | }; | 50 | }; |
48 | 51 | ||
49 | myServices.websites.webappDirs._dav = ./www; | 52 | myServices.websites.webappDirs._dav = ./www; |