aboutsummaryrefslogtreecommitdiff
path: root/nixops/modules/websites/tools/cloud.nix
diff options
context:
space:
mode:
authorIsmaël Bouya <ismael.bouya@normalesup.org>2019-05-21 02:47:52 +0200
committerIsmaël Bouya <ismael.bouya@normalesup.org>2019-05-21 02:47:52 +0200
commitf40f5b235b890f46770a22f005f8a0f664cf0562 (patch)
tree60bbcac4b528324fe7e83f280d65190b57bb810a /nixops/modules/websites/tools/cloud.nix
parent1480d60775dcd38b33abd367a91cd1b865aacc54 (diff)
downloadNix-f40f5b235b890f46770a22f005f8a0f664cf0562.tar.gz
Nix-f40f5b235b890f46770a22f005f8a0f664cf0562.tar.zst
Nix-f40f5b235b890f46770a22f005f8a0f664cf0562.zip
Replace myPhpfpm with correct overrides
Diffstat (limited to 'nixops/modules/websites/tools/cloud.nix')
-rw-r--r--nixops/modules/websites/tools/cloud.nix8
1 files changed, 4 insertions, 4 deletions
diff --git a/nixops/modules/websites/tools/cloud.nix b/nixops/modules/websites/tools/cloud.nix
index 5e010f4..5d2ca40 100644
--- a/nixops/modules/websites/tools/cloud.nix
+++ b/nixops/modules/websites/tools/cloud.nix
@@ -17,7 +17,6 @@ let
17 zend_extension=${pkgs.php}/lib/php/extensions/opcache.so 17 zend_extension=${pkgs.php}/lib/php/extensions/opcache.so
18 ''; 18 '';
19 pool = '' 19 pool = ''
20 listen = ${socket}
21 user = wwwrun 20 user = wwwrun
22 group = wwwrun 21 group = wwwrun
23 listen.owner = wwwrun 22 listen.owner = wwwrun
@@ -170,9 +169,10 @@ in {
170 ln -s ${nextcloud} $out/webapps/${webappName} 169 ln -s ${nextcloud} $out/webapps/${webappName}
171 ''; 170 '';
172 171
173 services.myPhpfpm = { 172 services.phpfpm.pools.nextcloud = {
174 poolPhpConfigs.nextcloud = phpFpm.phpConfig; 173 listen = phpFpm.socket;
175 poolConfigs.nextcloud = phpFpm.pool; 174 extraConfig = phpFpm.pool;
175 phpOptions = config.services.phpfpm.phpOptions + phpFpm.phpConfig;
176 }; 176 };
177 177
178 services.cron = { 178 services.cron = {