-{ lib, pkgs, config, myconfig, mylibs, ... }:
+{ lib, pkgs, config, myconfig, ... }:
let
- piedsjaloux = pkgs.callPackage ./piedsjaloux.nix { inherit (mylibs) fetchedGitPrivate; };
- piedsjaloux_dev = piedsjaloux {
- config = myconfig.env.websites.piedsjaloux.integration;
- };
- piedsjaloux_prod = piedsjaloux {
- config = myconfig.env.websites.piedsjaloux.production;
- };
+ piedsjaloux_dev = pkgs.callPackage ./piedsjaloux.nix {
+ inherit (pkgs.webapps) piedsjaloux;
+ config = myconfig.env.websites.piedsjaloux.integration;
+ };
+ piedsjaloux_prod = pkgs.callPackage ./piedsjaloux.nix {
+ inherit (pkgs.webapps) piedsjaloux;
+ config = myconfig.env.websites.piedsjaloux.production;
+ };
- cfg = config.services.myWebsites.PiedsJaloux;
+ cfg = config.services.myWebsites.PiedsJaloux;
in {
options.services.myWebsites.PiedsJaloux = {
production = {
system.activationScripts.piedsjaloux_prod = piedsjaloux_prod.activationScript;
system.extraSystemBuilderCmds = ''
mkdir -p $out/webapps
- ln -s ${piedsjaloux_prod.webRoot} $out/webapps/${piedsjaloux_prod.apache.webappName}
+ ln -s ${piedsjaloux_prod.app.webRoot} $out/webapps/${piedsjaloux_prod.apache.webappName}
'';
- services.myWebsites.production.modules = piedsjaloux_prod.apache.modules;
- services.myWebsites.production.vhostConfs.piedsjaloux = {
+ services.websites.production.modules = piedsjaloux_prod.apache.modules;
+ services.websites.production.vhostConfs.piedsjaloux = {
certName = "piedsjaloux";
hosts = [ "piedsjaloux.fr" "www.piedsjaloux.fr" ];
root = piedsjaloux_prod.apache.root;
system.activationScripts.piedsjaloux_dev = piedsjaloux_dev.activationScript;
system.extraSystemBuilderCmds = ''
mkdir -p $out/webapps
- ln -s ${piedsjaloux_dev.webRoot} $out/webapps/${piedsjaloux_dev.apache.webappName}
+ ln -s ${piedsjaloux_dev.app.webRoot} $out/webapps/${piedsjaloux_dev.apache.webappName}
'';
- services.myWebsites.integration.modules = piedsjaloux_dev.apache.modules;
- services.myWebsites.integration.vhostConfs.piedsjaloux = {
+ services.websites.integration.modules = piedsjaloux_dev.apache.modules;
+ services.websites.integration.vhostConfs.piedsjaloux = {
certName = "eldiron";
hosts = [ "piedsjaloux.immae.eu" ];
root = piedsjaloux_dev.apache.root;