-{ lib, pkgs, config, myconfig, mylibs, ... }:
+{ lib, pkgs, config, myconfig, ... }:
let
- chloe = pkgs.callPackage ./chloe.nix { inherit (mylibs) fetchedGitPrivate; };
- chloe_dev = chloe {
- config = myconfig.env.websites.chloe.integration;
- };
- chloe_prod = chloe {
- config = myconfig.env.websites.chloe.production;
- };
+ chloe_dev = pkgs.callPackage ./chloe.nix {
+ inherit (pkgs.private.webapps) chloe;
+ config = myconfig.env.websites.chloe.integration;
+ };
+ chloe_prod = pkgs.callPackage ./chloe.nix {
+ inherit (pkgs.private.webapps) chloe;
+ config = myconfig.env.websites.chloe.production;
+ };
- cfg = config.services.myWebsites.Chloe;
+ cfg = config.services.myWebsites.Chloe;
in {
options.services.myWebsites.Chloe = {
production = {
};
};
- imports = [
- ../commons/stats.nix
- ];
-
config = lib.mkMerge [
(lib.mkIf cfg.production.enable {
secrets.keys = chloe_prod.keys;
- services.myWebsites.commons.stats.enable = true;
- services.myWebsites.commons.stats.sites = [
- { name = "osteopathe-cc.fr"; }
- ];
+ services.webstats.sites = [ { name = "osteopathe-cc.fr"; } ];
security.acme.certs."chloe" = config.services.myCertificates.certConfig // {
domain = "osteopathe-cc.fr";
system.activationScripts.chloe_prod = chloe_prod.activationScript;
system.extraSystemBuilderCmds = ''
mkdir -p $out/webapps
- ln -s ${chloe_prod.webRoot} $out/webapps/${chloe_prod.apache.webappName}
+ ln -s ${chloe_prod.app.webRoot} $out/webapps/${chloe_prod.apache.webappName}
'';
services.myWebsites.production.modules = chloe_prod.apache.modules;
services.myWebsites.production.vhostConfs.chloe = {
system.activationScripts.chloe_dev = chloe_dev.activationScript;
system.extraSystemBuilderCmds = ''
mkdir -p $out/webapps
- ln -s ${chloe_dev.webRoot} $out/webapps/${chloe_dev.apache.webappName}
+ ln -s ${chloe_dev.app.webRoot} $out/webapps/${chloe_dev.apache.webappName}
'';
services.myWebsites.integration.modules = chloe_dev.apache.modules;
services.myWebsites.integration.vhostConfs.chloe = {