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/integration.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'modules/private/websites/chloe/integration.nix') diff --git a/modules/private/websites/chloe/integration.nix b/modules/private/websites/chloe/integration.nix index 6276eb7..caf6548 100644 --- a/modules/private/websites/chloe/integration.nix +++ b/modules/private/websites/chloe/integration.nix @@ -17,8 +17,9 @@ in { systemd.services.phpfpm-chloe_dev.after = lib.mkAfter chloe.phpFpm.serviceDeps; systemd.services.phpfpm-chloe_dev.wants = chloe.phpFpm.serviceDeps; services.phpfpm.pools.chloe_dev = { - listen = chloe.phpFpm.socket; - extraConfig = chloe.phpFpm.pool; + user = config.services.httpd.Inte.user; + group = config.services.httpd.Inte.group; + settings = chloe.phpFpm.pool; phpOptions = config.services.phpfpm.phpOptions + '' extension=${pkgs.php}/lib/php/extensions/mysqli.so ''; @@ -31,7 +32,9 @@ in { addToCerts = true; hosts = ["chloe.immae.eu" ]; root = chloe.apache.root; - extraConfig = [ chloe.apache.vhostConf ]; + extraConfig = [ + (chloe.apache.vhostConf config.services.phpfpm.pools.chloe_dev.socket) + ]; }; services.websites.env.integration.watchPaths = [ "/var/secrets/webapps/${chloe.app.environment}-chloe" -- cgit v1.2.3