From 5400b9b6f65451d41a9106fae6fc00f97d83f4ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Isma=C3=ABl=20Bouya?= Date: Wed, 25 Mar 2020 11:57:48 +0100 Subject: Upgrade nixos --- modules/private/websites/chloe/production.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'modules/private/websites/chloe/production.nix') diff --git a/modules/private/websites/chloe/production.nix b/modules/private/websites/chloe/production.nix index 578bf91..83f6c9b 100644 --- a/modules/private/websites/chloe/production.nix +++ b/modules/private/websites/chloe/production.nix @@ -19,8 +19,9 @@ in { systemd.services.phpfpm-chloe_prod.after = lib.mkAfter chloe.phpFpm.serviceDeps; systemd.services.phpfpm-chloe_prod.wants = chloe.phpFpm.serviceDeps; services.phpfpm.pools.chloe_prod = { - listen = chloe.phpFpm.socket; - extraConfig = chloe.phpFpm.pool; + user = config.services.httpd.Prod.user; + group = config.services.httpd.Prod.group; + settings = chloe.phpFpm.pool; phpOptions = config.services.phpfpm.phpOptions + '' extension=${pkgs.php}/lib/php/extensions/mysqli.so ''; @@ -39,7 +40,7 @@ in { RewriteCond "%{HTTP_HOST}" "!^www\.osteopathe-cc\.fr$" [NC] RewriteRule ^(.+)$ https://www.osteopathe-cc.fr$1 [R=302,L] '' - chloe.apache.vhostConf + (chloe.apache.vhostConf config.services.phpfpm.pools.chloe_prod.socket) ]; }; services.websites.env.production.watchPaths = [ -- cgit v1.2.3