From f8bde3d6d31da84b5e81bdfc4f96efdf6bec3df2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Isma=C3=ABl=20Bouya?= Date: Thu, 10 Jan 2019 20:56:44 +0100 Subject: Add http configuration to modules and separate production from integration --- virtual/modules/websites/chloe.nix | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) (limited to 'virtual/modules/websites/chloe.nix') diff --git a/virtual/modules/websites/chloe.nix b/virtual/modules/websites/chloe.nix index d54c42d..67e8e1f 100644 --- a/virtual/modules/websites/chloe.nix +++ b/virtual/modules/websites/chloe.nix @@ -26,13 +26,25 @@ in { services.phpfpm.poolConfigs.chloe_prod = chloe_prod.phpFpm.pool; system.activationScripts.chloe_prod = chloe_prod.activationScript; - services.myWebsites.apacheConfig.chloe_prod.modules = chloe_prod.apache.modules; + services.myWebsites.production.modules = chloe_prod.apache.modules; + services.myWebsites.production.vhostConfs.chloe = { + certName = "chloe"; + hosts = ["osteopathe-cc.fr" "www.osteopathe-cc.fr" ]; + root = chloe_prod.webRoot; + extraConfig = [ chloe_prod.apache.vhostConf ]; + }; }) (lib.mkIf cfg.integration.enable { security.acme.certs."eldiron".extraDomains."chloe.immae.eu" = null; services.phpfpm.poolConfigs.chloe_dev = chloe_dev.phpFpm.pool; system.activationScripts.chloe_dev = chloe_dev.activationScript; - services.myWebsites.apacheConfig.chloe_dev.modules = chloe_dev.apache.modules; + services.myWebsites.integration.modules = chloe_dev.apache.modules; + services.myWebsites.integration.vhostConfs.chloe = { + certName = "eldiron"; + hosts = ["chloe.immae.eu" ]; + root = chloe_dev.webRoot; + extraConfig = [ chloe_dev.apache.vhostConf ]; + }; }) ]; } -- cgit v1.2.3