-{ 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.webapps) chloe;
+ config = myconfig.env.websites.chloe.integration;
+ };
+ chloe_prod = pkgs.callPackage ./chloe.nix {
+ inherit (pkgs.webapps) chloe;
+ config = myconfig.env.websites.chloe.production;
+ };
- cfg = config.services.myWebsites.Chloe;
+ cfg = config.services.myWebsites.Chloe;
in {
options.services.myWebsites.Chloe = {
production = {
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 = {
+ services.websites.production.modules = chloe_prod.apache.modules;
+ services.websites.production.vhostConfs.chloe = {
certName = "chloe";
hosts = ["osteopathe-cc.fr" "www.osteopathe-cc.fr" ];
root = chloe_prod.apache.root;
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 = {
+ services.websites.integration.modules = chloe_dev.apache.modules;
+ services.websites.integration.vhostConfs.chloe = {
certName = "eldiron";
hosts = ["chloe.immae.eu" ];
root = chloe_dev.apache.root;