Add http configuration to modules and separate production from

integration

1 files changed, 14 insertions, 2 deletions

diff --git a/virtual/modules/websites/connexionswing.nix b/virtual/modules/websites/connexionswing.nix
index 8bf63a8..dcc7264 100644
--- a/virtual/modules/websites/connexionswing.nix
+++ b/virtual/modules/websites/connexionswing.nix
@@ -28,14 +28,26 @@ in {
 
       services.phpfpm.poolConfigs.connexionswing_prod = connexionswing_prod.phpFpm.pool;
       system.activationScripts.connexionswing_prod = connexionswing_prod.activationScript;
-      services.myWebsites.apacheConfig.connexionswing_prod.modules = connexionswing_prod.apache.modules;
+      services.myWebsites.production.modules = connexionswing_prod.apache.modules;
+      services.myWebsites.production.vhostConfs.connexionswing = {
+        certName    = "connexionswing";
+        hosts       = ["connexionswing.com" "sandetludo.com" "www.connexionswing.com" "www.sandetludo.com" ];
+        root        = connexionswing_prod.webRoot;
+        extraConfig = [ connexionswing_prod.apache.vhostConf ];
+      };
     })
     (lib.mkIf cfg.integration.enable {
       security.acme.certs."eldiron".extraDomains."sandetludo.immae.eu" = null;
       security.acme.certs."eldiron".extraDomains."connexionswing.immae.eu" = null;
       services.phpfpm.poolConfigs.connexionswing_dev = connexionswing_dev.phpFpm.pool;
       system.activationScripts.connexionswing_dev = connexionswing_dev.activationScript;
-      services.myWebsites.apacheConfig.connexionswing_dev.modules = connexionswing_dev.apache.modules;
+      services.myWebsites.integration.modules = connexionswing_dev.apache.modules;
+      services.myWebsites.integration.vhostConfs.connexionswing = {
+        certName    = "eldiron";
+        hosts       = ["connexionswing.immae.eu" "sandetludo.immae.eu" ];
+        root        = connexionswing_dev.webRoot;
+        extraConfig = [ connexionswing_dev.apache.vhostConf ];
+      };
     })
   ];
 }