X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=modules%2Fprivate%2Fwebsites%2Fchloe%2Fintegration.nix;fp=modules%2Fprivate%2Fwebsites%2Fchloe%2Fintegration.nix;h=caf6548dbb01a0ab4c48807cb2936e6ae25c6c82;hb=5400b9b6f65451d41a9106fae6fc00f97d83f4ef;hp=6276eb7bf1a236a8c51b37220505eab001440361;hpb=441da8aac378f401625e82caf281fa0e26128310;p=perso%2FImmae%2FConfig%2FNix.git 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"