Upgrade wallabag

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

diff --git a/virtual/modules/websites/aten/default.nix b/virtual/modules/websites/aten/default.nix
index d9db75cbdfe60668943015399945151c7500899f..db2ab491fa14c76492f92f01c7c1f0156b8ba3f1 100644 (file)
--- a/virtual/modules/websites/aten/default.nix
+++ b/virtual/modules/websites/aten/default.nix
@@ -1,8 +1,12 @@
-{ lib, pkgs, config, mylibs, ... }:
+{ lib, pkgs, config, myconfig, mylibs, ... }:
 let
-    aten = pkgs.callPackage ./aten.nix { inherit (mylibs) checkEnv fetchedGitPrivate; };
-    aten_dev  = aten { environment = "dev"; };
-    aten_prod = aten { environment = "prod"; };
+    aten = pkgs.callPackage ./aten.nix { inherit (mylibs) fetchedGitPrivate; };
+    aten_dev  = aten {
+      config = myconfig.env.websites.aten.integration;
+    };
+    aten_prod = aten {
+      config = myconfig.env.websites.aten.production;
+    };
 
     cfg = config.services.myWebsites.Aten;
 in {
@@ -36,7 +40,7 @@ in {
         };
       };
 
-      services.phpfpm.poolConfigs.aten_prod = aten_prod.phpFpm.pool;
+      services.myPhpfpm.poolConfigs.aten_prod = aten_prod.phpFpm.pool;
       system.activationScripts.aten_prod = aten_prod.activationScript;
       services.myWebsites.apacheConfig.aten_prod.modules = aten_prod.apache.modules;
       services.myWebsites.production.modules = aten_prod.apache.modules;
@@ -49,7 +53,7 @@ in {
     })
     (lib.mkIf cfg.integration.enable {
       security.acme.certs."eldiron".extraDomains."dev.aten.pro" = null;
-      services.phpfpm.poolConfigs.aten_dev = aten_dev.phpFpm.pool;
+      services.myPhpfpm.poolConfigs.aten_dev = aten_dev.phpFpm.pool;
       system.activationScripts.aten_dev = aten_dev.activationScript;
       services.myWebsites.integration.modules = aten_dev.apache.modules;
       services.myWebsites.integration.vhostConfs.aten = {