Add rompr

[perso/Immae/Config/Nix.git] / virtual / modules / websites / ludivine / default.nix

diff --git a/virtual/modules/websites/ludivine/default.nix b/virtual/modules/websites/ludivine/default.nix
index ed719ba42a5520f88cdc82458b7d2ecc3a0a592d..d13d7004ceef7dceb4f1f8232e428ffc3e550d29 100644 (file)
--- a/virtual/modules/websites/ludivine/default.nix
+++ b/virtual/modules/websites/ludivine/default.nix
@@ -1,8 +1,12 @@
-{ lib, pkgs, config, mylibs, ... }:
+{ lib, pkgs, config, myconfig, mylibs, ... }:
 let
-    ludivinecassal = pkgs.callPackage ./ludivinecassal.nix { inherit (mylibs) checkEnv fetchedGitPrivate; };
-    ludivinecassal_dev  = ludivinecassal { environment = "dev"; };
-    ludivinecassal_prod = ludivinecassal { environment = "prod"; };
+    ludivinecassal = pkgs.callPackage ./ludivinecassal.nix { inherit (mylibs) fetchedGitPrivate; };
+    ludivinecassal_dev  = ludivinecassal {
+      config = myconfig.env.websites.ludivinecassal.integration;
+    };
+    ludivinecassal_prod = ludivinecassal {
+      config = myconfig.env.websites.ludivinecassal.production;
+    };
 
     cfg = config.services.myWebsites.Ludivine;
 in {
@@ -32,7 +36,7 @@ in {
         };
       };
 
-      services.phpfpm.poolConfigs.ludivinecassal_prod = ludivinecassal_prod.phpFpm.pool;
+      services.myPhpfpm.poolConfigs.ludivinecassal_prod = ludivinecassal_prod.phpFpm.pool;
       system.activationScripts.ludivinecassal_prod = ludivinecassal_prod.activationScript;
       services.myWebsites.production.modules = ludivinecassal_prod.apache.modules;
       services.myWebsites.production.vhostConfs.ludivine = {
@@ -45,7 +49,7 @@ in {
     (lib.mkIf cfg.integration.enable {
       security.acme.certs."eldiron".extraDomains."ludivine.immae.eu" = null;
 
-      services.phpfpm.poolConfigs.ludivinecassal_dev = ludivinecassal_dev.phpFpm.pool;
+      services.myPhpfpm.poolConfigs.ludivinecassal_dev = ludivinecassal_dev.phpFpm.pool;
       system.activationScripts.ludivinecassal_dev = ludivinecassal_dev.activationScript;
       services.myWebsites.apacheConfig.ludivinecassal_dev.modules = ludivinecassal_dev.apache.modules;
       services.myWebsites.integration.modules = ludivinecassal_dev.apache.modules;