From 29f8cb850d74b456d6481a456311bbf5361d328c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Isma=C3=ABl=20Bouya?= Date: Sat, 1 Jun 2019 12:51:51 +0200 Subject: Refactor websites options --- modules/private/websites/connexionswing/integration.nix | 4 ++-- modules/private/websites/connexionswing/production.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'modules/private/websites/connexionswing') diff --git a/modules/private/websites/connexionswing/integration.nix b/modules/private/websites/connexionswing/integration.nix index 7d77ac7..795d532 100644 --- a/modules/private/websites/connexionswing/integration.nix +++ b/modules/private/websites/connexionswing/integration.nix @@ -23,8 +23,8 @@ in { }; system.activationScripts.connexionswing_dev = connexionswing.activationScript; myServices.websites.webappDirs."${connexionswing.apache.webappName}" = connexionswing.app.webRoot; - services.websites.integration.modules = connexionswing.apache.modules; - services.websites.integration.vhostConfs.connexionswing = { + services.websites.env.integration.modules = connexionswing.apache.modules; + services.websites.env.integration.vhostConfs.connexionswing = { certName = "eldiron"; addToCerts = true; hosts = ["connexionswing.immae.eu" "sandetludo.immae.eu" ]; diff --git a/modules/private/websites/connexionswing/production.nix b/modules/private/websites/connexionswing/production.nix index f4cb377..07647da 100644 --- a/modules/private/websites/connexionswing/production.nix +++ b/modules/private/websites/connexionswing/production.nix @@ -25,8 +25,8 @@ in { }; system.activationScripts.connexionswing_prod = connexionswing.activationScript; myServices.websites.webappDirs."${connexionswing.apache.webappName}" = connexionswing.app.webRoot; - services.websites.production.modules = connexionswing.apache.modules; - services.websites.production.vhostConfs.connexionswing = { + services.websites.env.production.modules = connexionswing.apache.modules; + services.websites.env.production.vhostConfs.connexionswing = { certName = "connexionswing"; certMainHost = "connexionswing.com"; hosts = ["connexionswing.com" "sandetludo.com" "www.connexionswing.com" "www.sandetludo.com" ]; -- cgit v1.2.3