-{ lib, pkgs, config, mylibs, myconfig, ... }:
+{ lib, pkgs, config, myconfig, ... }:
let
- connexionswing = pkgs.callPackage ./connexionswing.nix { inherit (mylibs) fetchedGitPrivate; };
- connexionswing_dev = connexionswing {
- config = myconfig.env.websites.connexionswing.integration;
- };
- connexionswing_prod = connexionswing {
- config = myconfig.env.websites.connexionswing.production;
- };
+ connexionswing_dev = pkgs.callPackage ./connexionswing.nix {
+ inherit (pkgs.webapps) connexionswing;
+ config = myconfig.env.websites.connexionswing.integration;
+ };
+ connexionswing_prod = pkgs.callPackage ./connexionswing.nix {
+ inherit (pkgs.webapps) connexionswing;
+ config = myconfig.env.websites.connexionswing.production;
+ };
- cfg = config.services.myWebsites.Connexionswing;
+ cfg = config.services.myWebsites.Connexionswing;
in {
options.services.myWebsites.Connexionswing = {
production = {
};
};
- imports = [
- ../commons/stats.nix
- ];
-
config = lib.mkMerge [
(lib.mkIf cfg.production.enable {
- deployment.keys = connexionswing_prod.keys;
- services.myWebsites.commons.stats.enable = true;
- services.myWebsites.commons.stats.sites = [
- {
- name = "connexionswing.com";
- conf = ./goaccess.conf;
- }
- ];
+ secrets.keys = connexionswing_prod.keys;
+ services.webstats.sites = [ { name = "connexionswing.com"; } ];
security.acme.certs."connexionswing" = config.services.myCertificates.certConfig // {
domain = "connexionswing.com";
system.activationScripts.connexionswing_prod = connexionswing_prod.activationScript;
system.extraSystemBuilderCmds = ''
mkdir -p $out/webapps
- ln -s ${connexionswing_prod.webRoot} $out/webapps/${connexionswing_prod.apache.webappName}
+ ln -s ${connexionswing_prod.app.webRoot} $out/webapps/${connexionswing_prod.apache.webappName}
'';
services.myWebsites.production.modules = connexionswing_prod.apache.modules;
services.myWebsites.production.vhostConfs.connexionswing = {
};
})
(lib.mkIf cfg.integration.enable {
- deployment.keys = connexionswing_dev.keys;
+ secrets.keys = connexionswing_dev.keys;
security.acme.certs."eldiron".extraDomains."sandetludo.immae.eu" = null;
security.acme.certs."eldiron".extraDomains."connexionswing.immae.eu" = null;
services.myPhpfpm.preStart.connexionswing_dev = connexionswing_dev.phpFpm.preStart;
system.activationScripts.connexionswing_dev = connexionswing_dev.activationScript;
system.extraSystemBuilderCmds = ''
mkdir -p $out/webapps
- ln -s ${connexionswing_dev.webRoot} $out/webapps/${connexionswing_dev.apache.webappName}
+ ln -s ${connexionswing_dev.app.webRoot} $out/webapps/${connexionswing_dev.apache.webappName}
'';
services.myWebsites.integration.modules = connexionswing_dev.apache.modules;
services.myWebsites.integration.vhostConfs.connexionswing = {