-{ lib, pkgs, config, myconfig, ... }:
+{ lib, pkgs, config, ... }:
let
chloe = pkgs.callPackage ./builder.nix {
inherit (pkgs.webapps) chloe;
- config = myconfig.env.websites.chloe.integration;
+ config = config.myEnv.websites.chloe.integration;
apacheUser = config.services.httpd.Inte.user;
apacheGroup = config.services.httpd.Inte.group;
};
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
'';
myServices.websites.webappDirs."${chloe.apache.webappName}" = chloe.app.webRoot;
services.websites.env.integration.modules = chloe.apache.modules;
services.websites.env.integration.vhostConfs.chloe = {
- certName = "eldiron";
+ certName = "integration";
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"