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/isabelle/iridologie.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'modules/private/websites/isabelle/iridologie.nix') diff --git a/modules/private/websites/isabelle/iridologie.nix b/modules/private/websites/isabelle/iridologie.nix index 460bd2a..ffbf259 100644 --- a/modules/private/websites/isabelle/iridologie.nix +++ b/modules/private/websites/isabelle/iridologie.nix @@ -19,8 +19,9 @@ in { systemd.services.phpfpm-iridologie.after = lib.mkAfter iridologie.phpFpm.serviceDeps; systemd.services.phpfpm-iridologie.wants = iridologie.phpFpm.serviceDeps; services.phpfpm.pools.iridologie = { - listen = iridologie.phpFpm.socket; - extraConfig = iridologie.phpFpm.pool; + user = config.services.httpd.Prod.user; + group = config.services.httpd.Prod.group; + settings = iridologie.phpFpm.pool; phpOptions = config.services.phpfpm.phpOptions + '' extension=${pkgs.php}/lib/php/extensions/mysqli.so ''; @@ -39,7 +40,7 @@ in { RewriteCond "%{HTTP_HOST}" "!^iridologie\.icommandeur\.org$" [NC] RewriteRule ^(.+)$ https://iridologie.icommandeur.org$1 [R=302,L] '' - iridologie.apache.vhostConf + (iridologie.apache.vhostConf config.services.phpfpm.pools.iridologie.socket) ]; }; services.websites.env.production.watchPaths = [ -- cgit v1.2.3