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/ludivinecassal/integration.nix | 4 ++-- modules/private/websites/ludivinecassal/production.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'modules/private/websites/ludivinecassal') diff --git a/modules/private/websites/ludivinecassal/integration.nix b/modules/private/websites/ludivinecassal/integration.nix index f0ef3a6..bc05d9b 100644 --- a/modules/private/websites/ludivinecassal/integration.nix +++ b/modules/private/websites/ludivinecassal/integration.nix @@ -20,8 +20,8 @@ in { services.phpfpm.poolConfigs.ludivinecassal_dev = ludivinecassal.phpFpm.pool; system.activationScripts.ludivinecassal_dev = ludivinecassal.activationScript; myServices.websites.webappDirs."${ludivinecassal.apache.webappName}" = ludivinecassal.app.webRoot; - services.websites.integration.modules = ludivinecassal.apache.modules; - services.websites.integration.vhostConfs.ludivine = { + services.websites.env.integration.modules = ludivinecassal.apache.modules; + services.websites.env.integration.vhostConfs.ludivine = { certName = "eldiron"; addToCerts = true; hosts = [ "ludivine.immae.eu" ]; diff --git a/modules/private/websites/ludivinecassal/production.nix b/modules/private/websites/ludivinecassal/production.nix index 6a22d98..9d8407d 100644 --- a/modules/private/websites/ludivinecassal/production.nix +++ b/modules/private/websites/ludivinecassal/production.nix @@ -21,8 +21,8 @@ in { services.phpfpm.poolConfigs.ludivinecassal_prod = ludivinecassal.phpFpm.pool; system.activationScripts.ludivinecassal_prod = ludivinecassal.activationScript; myServices.websites.webappDirs."${ludivinecassal.apache.webappName}" = ludivinecassal.app.webRoot; - services.websites.production.modules = ludivinecassal.apache.modules; - services.websites.production.vhostConfs.ludivine = { + services.websites.env.production.modules = ludivinecassal.apache.modules; + services.websites.env.production.vhostConfs.ludivine = { certName = "ludivinecassal"; certMainHost = "ludivinecassal.com"; hosts = ["ludivinecassal.com" "www.ludivinecassal.com" ]; -- cgit v1.2.3