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/aten/integration.nix | 2 +- modules/private/websites/aten/production.nix | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'modules/private/websites/aten') diff --git a/modules/private/websites/aten/integration.nix b/modules/private/websites/aten/integration.nix index f8d8b53..0dbc4fa 100644 --- a/modules/private/websites/aten/integration.nix +++ b/modules/private/websites/aten/integration.nix @@ -32,7 +32,7 @@ in { secrets.keys = aten.keys; services.phpfpm.poolConfigs.aten_dev = aten.phpFpm.pool; - services.websites.integration.vhostConfs.aten = { + services.websites.env.integration.vhostConfs.aten = { certName = "eldiron"; addToCerts = true; hosts = [ "dev.aten.pro" ]; diff --git a/modules/private/websites/aten/production.nix b/modules/private/websites/aten/production.nix index 1a55e8a..0fab309 100644 --- a/modules/private/websites/aten/production.nix +++ b/modules/private/websites/aten/production.nix @@ -21,15 +21,15 @@ in { services.phpfpm.poolConfigs.aten_prod = aten.phpFpm.pool; system.activationScripts.aten_prod = aten.activationScript; myServices.websites.webappDirs."${aten.apache.webappName}" = aten.app.webRoot; - services.websites.production.modules = aten.apache.modules; - services.websites.production.vhostConfs.aten = { + services.websites.env.production.modules = aten.apache.modules; + services.websites.env.production.vhostConfs.aten = { certName = "aten"; certMainHost = "aten.pro"; hosts = [ "aten.pro" "www.aten.pro" ]; root = aten.apache.root; extraConfig = [ aten.apache.vhostConf ]; }; - services.websites.production.watchPaths = [ + services.websites.env.production.watchPaths = [ "/var/secrets/webapps/${aten.app.environment}-aten" ]; }; -- cgit v1.2.3