Add http configuration to modules and separate production from

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

diff --git a/virtual/modules/websites/piedsjaloux.nix b/virtual/modules/websites/piedsjaloux.nix
index 285fd18d11c5f55c4d1b1c2747901f01ab05d5d3..46161c7e8de8cc4605b13d58ec9c6e00380ab7ff 100644 (file)
--- a/virtual/modules/websites/piedsjaloux.nix
+++ b/virtual/modules/websites/piedsjaloux.nix
@@ -26,13 +26,25 @@ in {
 
       services.phpfpm.poolConfigs.piedsjaloux_prod = piedsjaloux_prod.phpFpm.pool;
       system.activationScripts.piedsjaloux_prod = piedsjaloux_prod.activationScript;
-      services.myWebsites.apacheConfig.piedsjaloux_prod.modules = piedsjaloux_prod.apache.modules;
+      services.myWebsites.production.modules = piedsjaloux_prod.apache.modules;
+      services.myWebsites.production.vhostConfs.piedsjaloux = {
+        certName    = "piedsjaloux";
+        hosts       = [ "piedsjaloux.fr" "www.piedsjaloux.fr" ];
+        root        = piedsjaloux_prod.webRoot;
+        extraConfig = [ piedsjaloux_prod.apache.vhostConf ];
+      };
     })
     (lib.mkIf cfg.integration.enable {
       security.acme.certs."eldiron".extraDomains."piedsjaloux.immae.eu" = null;
       services.phpfpm.poolConfigs.piedsjaloux_dev = piedsjaloux_dev.phpFpm.pool;
       system.activationScripts.piedsjaloux_dev = piedsjaloux_dev.activationScript;
-      services.myWebsites.apacheConfig.piedsjaloux_dev.modules = piedsjaloux_dev.apache.modules;
+      services.myWebsites.integration.modules = piedsjaloux_dev.apache.modules;
+      services.myWebsites.integration.vhostConfs.piedsjaloux = {
+        certName    = "eldiron";
+        hosts       = [ "piedsjaloux.immae.eu" ];
+        root        = piedsjaloux_dev.webRoot;
+        extraConfig = [ piedsjaloux_dev.apache.vhostConf ];
+      };
     })
   ];
 }