Remove use of environment variables

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

diff --git a/virtual/modules/websites/piedsjaloux/default.nix b/virtual/modules/websites/piedsjaloux/default.nix
index bf7417387ca0fb98bac378a93353c602a1880b5b..f1bb76039b3c74791ba2f4f88097a72a31614c91 100644 (file)
--- a/virtual/modules/websites/piedsjaloux/default.nix
+++ b/virtual/modules/websites/piedsjaloux/default.nix
@@ -1,8 +1,12 @@
-{ lib, pkgs, config, mylibs, ... }:
+{ lib, pkgs, config, myconfig, mylibs, ... }:
 let
-    piedsjaloux = pkgs.callPackage ./piedsjaloux.nix { inherit (mylibs) checkEnv fetchedGitPrivate; };
-    piedsjaloux_dev  = piedsjaloux { environment = "dev"; };
-    piedsjaloux_prod = piedsjaloux { environment = "prod"; };
+    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;
+    };
 
     cfg = config.services.myWebsites.PiedsJaloux;
 in {
@@ -36,7 +40,7 @@ in {
         };
       };
 
-      services.phpfpm.poolConfigs.piedsjaloux_prod = piedsjaloux_prod.phpFpm.pool;
+      services.myPhpfpm.poolConfigs.piedsjaloux_prod = piedsjaloux_prod.phpFpm.pool;
       system.activationScripts.piedsjaloux_prod = piedsjaloux_prod.activationScript;
       services.myWebsites.production.modules = piedsjaloux_prod.apache.modules;
       services.myWebsites.production.vhostConfs.piedsjaloux = {
@@ -48,7 +52,7 @@ in {
     })
     (lib.mkIf cfg.integration.enable {
       security.acme.certs."eldiron".extraDomains."piedsjaloux.immae.eu" = null;
-      services.phpfpm.poolConfigs.piedsjaloux_dev = piedsjaloux_dev.phpFpm.pool;
+      services.myPhpfpm.poolConfigs.piedsjaloux_dev = piedsjaloux_dev.phpFpm.pool;
       system.activationScripts.piedsjaloux_dev = piedsjaloux_dev.activationScript;
       services.myWebsites.integration.modules = piedsjaloux_dev.apache.modules;
       services.myWebsites.integration.vhostConfs.piedsjaloux = {