Add rompr

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

diff --git a/virtual/modules/websites/chloe/default.nix b/virtual/modules/websites/chloe/default.nix
index 72a9b6fdb01667a395f30352096726e10b2e9240..94cd4be5e7e0b99fadf03b93bbb0ccce5ac48cee 100644 (file)
--- a/virtual/modules/websites/chloe/default.nix
+++ b/virtual/modules/websites/chloe/default.nix
@@ -1,8 +1,12 @@
-{ lib, pkgs, config, mylibs, ... }:
+{ lib, pkgs, config, myconfig, mylibs, ... }:
 let
-    chloe = pkgs.callPackage ./chloe.nix { inherit (mylibs) checkEnv fetchedGitPrivate; };
-    chloe_dev = chloe { environment = "dev"; };
-    chloe_prod = chloe { environment = "prod"; };
+    chloe = pkgs.callPackage ./chloe.nix { inherit (mylibs) fetchedGitPrivate; };
+    chloe_dev  = chloe {
+      config = myconfig.env.websites.chloe.integration;
+    };
+    chloe_prod = chloe {
+      config = myconfig.env.websites.chloe.production;
+    };
 
     cfg = config.services.myWebsites.Chloe;
 in {
@@ -36,7 +40,10 @@ in {
         };
       };
 
-      services.phpfpm.poolConfigs.chloe_prod = chloe_prod.phpFpm.pool;
+      services.myPhpfpm.poolConfigs.chloe_prod = chloe_prod.phpFpm.pool;
+      services.myPhpfpm.poolPhpConfigs.chloe_prod = ''
+        extension=${pkgs.php}/lib/php/extensions/mysqli.so
+        '';
       system.activationScripts.chloe_prod = chloe_prod.activationScript;
       services.myWebsites.production.modules = chloe_prod.apache.modules;
       services.myWebsites.production.vhostConfs.chloe = {
@@ -48,7 +55,10 @@ in {
     })
     (lib.mkIf cfg.integration.enable {
       security.acme.certs."eldiron".extraDomains."chloe.immae.eu" = null;
-      services.phpfpm.poolConfigs.chloe_dev = chloe_dev.phpFpm.pool;
+      services.myPhpfpm.poolConfigs.chloe_dev = chloe_dev.phpFpm.pool;
+      services.myPhpfpm.poolPhpConfigs.chloe_dev = ''
+        extension=${pkgs.php}/lib/php/extensions/mysqli.so
+        '';
       system.activationScripts.chloe_dev = chloe_dev.activationScript;
       services.myWebsites.integration.modules = chloe_dev.apache.modules;
       services.myWebsites.integration.vhostConfs.chloe = {