X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=virtual%2Fmodules%2Fwebsites%2Fconnexionswing%2Fdefault.nix;h=2e4dfc7ad9483d17cada504734f8f60899998e16;hb=159d8ff3f05b0ba7dc65b23f5a7b30ddfc59d13f;hp=636b16eefba479049bd990b3b3a309e8ca7ba80e;hpb=091ae73429b8853e6ab971bffaccd84bdd59f40d;p=perso%2FImmae%2FConfig%2FNix.git

diff --git a/virtual/modules/websites/connexionswing/default.nix b/virtual/modules/websites/connexionswing/default.nix
index 636b16e..2e4dfc7 100644
--- a/virtual/modules/websites/connexionswing/default.nix
+++ b/virtual/modules/websites/connexionswing/default.nix
@@ -1,8 +1,12 @@
-{ lib, pkgs, config, mylibs, ... }:
+{ lib, pkgs, config, mylibs, myconfig, ... }:
 let
-    connexionswing = pkgs.callPackage ./connexionswing.nix { inherit (mylibs) checkEnv fetchedGitPrivate; };
-    connexionswing_dev  = connexionswing { environment = "dev"; };
-    connexionswing_prod = connexionswing { environment = "prod"; };
+    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;
+    };
 
     cfg = config.services.myWebsites.Connexionswing;
 in {
@@ -38,7 +42,7 @@ in {
         };
       };
 
-      services.phpfpm.poolConfigs.connexionswing_prod = connexionswing_prod.phpFpm.pool;
+      services.myPhpfpm.poolConfigs.connexionswing_prod = connexionswing_prod.phpFpm.pool;
       system.activationScripts.connexionswing_prod = connexionswing_prod.activationScript;
       services.myWebsites.production.modules = connexionswing_prod.apache.modules;
       services.myWebsites.production.vhostConfs.connexionswing = {
@@ -51,7 +55,7 @@ in {
     (lib.mkIf cfg.integration.enable {
       security.acme.certs."eldiron".extraDomains."sandetludo.immae.eu" = null;
       security.acme.certs."eldiron".extraDomains."connexionswing.immae.eu" = null;
-      services.phpfpm.poolConfigs.connexionswing_dev = connexionswing_dev.phpFpm.pool;
+      services.myPhpfpm.poolConfigs.connexionswing_dev = connexionswing_dev.phpFpm.pool;
       system.activationScripts.connexionswing_dev = connexionswing_dev.activationScript;
       services.myWebsites.integration.modules = connexionswing_dev.apache.modules;
       services.myWebsites.integration.vhostConfs.connexionswing = {