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/aten.nix | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) (limited to 'virtual/modules/websites/aten.nix') diff --git a/virtual/modules/websites/aten.nix b/virtual/modules/websites/aten.nix index 1a65389..53db03a 100644 --- a/virtual/modules/websites/aten.nix +++ b/virtual/modules/websites/aten.nix @@ -27,12 +27,25 @@ in { services.phpfpm.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; + services.myWebsites.production.vhostConfs.aten = { + certName = "aten"; + hosts = [ "aten.pro" "www.aten.pro" ]; + root = aten_prod.webRoot; + extraConfig = [ aten_prod.apache.vhostConf ]; + }; }) (lib.mkIf cfg.integration.enable { security.acme.certs."eldiron".extraDomains."dev.aten.pro" = null; services.phpfpm.poolConfigs.aten_dev = aten_dev.phpFpm.pool; system.activationScripts.aten_dev = aten_dev.activationScript; - services.myWebsites.apacheConfig.aten_dev.modules = aten_dev.apache.modules; + services.myWebsites.integration.modules = aten_dev.apache.modules; + services.myWebsites.integration.vhostConfs.aten = { + certName = "eldiron"; + hosts = [ "dev.aten.pro" ]; + root = aten_dev.webRoot; + extraConfig = [ aten_dev.apache.vhostConf ]; + }; }) ]; } -- cgit v1.2.3