X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=nixops%2Fmodules%2Fwebsites%2Fconnexionswing%2Fdefault.nix;h=3643e190a19439c5a83a6ea51ed03e1149fdefd4;hb=daf64e3f7de98e4267823d14fa34891b27b5f657;hp=f98b3491397e15cb4bb04a8b780d718342e08b9a;hpb=7da3ceece7fe6c49046e97f37fc353db9b8a981c;p=perso%2FImmae%2FConfig%2FNix.git diff --git a/nixops/modules/websites/connexionswing/default.nix b/nixops/modules/websites/connexionswing/default.nix index f98b349..3643e19 100644 --- a/nixops/modules/websites/connexionswing/default.nix +++ b/nixops/modules/websites/connexionswing/default.nix @@ -1,14 +1,15 @@ -{ 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 = { @@ -19,19 +20,10 @@ in { }; }; - imports = [ - ../commons/stats.nix - ]; - config = lib.mkMerge [ (lib.mkIf cfg.production.enable { - 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"; @@ -42,15 +34,17 @@ in { }; }; + services.myPhpfpm.preStart.connexionswing_prod = connexionswing_prod.phpFpm.preStart; + services.myPhpfpm.serviceDependencies.connexionswing_prod = connexionswing_prod.phpFpm.serviceDeps; services.myPhpfpm.poolConfigs.connexionswing_prod = connexionswing_prod.phpFpm.pool; services.myPhpfpm.poolPhpConfigs.connexionswing_prod = connexionswing_prod.phpFpm.phpConfig; 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 = { + services.websites.production.modules = connexionswing_prod.apache.modules; + services.websites.production.vhostConfs.connexionswing = { certName = "connexionswing"; hosts = ["connexionswing.com" "sandetludo.com" "www.connexionswing.com" "www.sandetludo.com" ]; root = connexionswing_prod.apache.root; @@ -58,17 +52,20 @@ in { }; }) (lib.mkIf cfg.integration.enable { + 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; + services.myPhpfpm.serviceDependencies.connexionswing_dev = connexionswing_dev.phpFpm.serviceDeps; services.myPhpfpm.poolConfigs.connexionswing_dev = connexionswing_dev.phpFpm.pool; services.myPhpfpm.poolPhpConfigs.connexionswing_dev = connexionswing_dev.phpFpm.phpConfig; 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 = { + services.websites.integration.modules = connexionswing_dev.apache.modules; + services.websites.integration.vhostConfs.connexionswing = { certName = "eldiron"; hosts = ["connexionswing.immae.eu" "sandetludo.immae.eu" ]; root = connexionswing_dev.apache.root;