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/immae/production.nix | 6 +++--- modules/private/websites/immae/release.nix | 2 +- modules/private/websites/immae/temp.nix | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) (limited to 'modules/private/websites/immae') diff --git a/modules/private/websites/immae/production.nix b/modules/private/websites/immae/production.nix index c3cabb6..3c851e6 100644 --- a/modules/private/websites/immae/production.nix +++ b/modules/private/websites/immae/production.nix @@ -22,8 +22,8 @@ in { php_admin_value[open_basedir] = "${varDir}:/tmp" ''; - services.websites.production.modules = [ "proxy_fcgi" ]; - services.websites.production.vhostConfs.immae = { + services.websites.env.production.modules = [ "proxy_fcgi" ]; + services.websites.env.production.vhostConfs.immae = { certName = "eldiron"; addToCerts = true; hosts = [ "www.immae.eu" ]; @@ -51,7 +51,7 @@ in { ]; }; - services.websites.production.vhostConfs.bouya = { + services.websites.env.production.vhostConfs.bouya = { certName = "eldiron"; addToCerts = true; hosts = [ "bouya.org" "www.bouya.org" ]; diff --git a/modules/private/websites/immae/release.nix b/modules/private/websites/immae/release.nix index 68381a6..5cc35ee 100644 --- a/modules/private/websites/immae/release.nix +++ b/modules/private/websites/immae/release.nix @@ -9,7 +9,7 @@ in { config = lib.mkIf cfg.enable { services.webstats.sites = [ { name = "release.immae.eu"; } ]; - services.websites.production.vhostConfs.release = { + services.websites.env.production.vhostConfs.release = { certName = "eldiron"; addToCerts = true; hosts = [ "release.immae.eu" ]; diff --git a/modules/private/websites/immae/temp.nix b/modules/private/websites/immae/temp.nix index 0b2a3a3..288c8cc 100644 --- a/modules/private/websites/immae/temp.nix +++ b/modules/private/websites/immae/temp.nix @@ -7,8 +7,8 @@ in { options.myServices.websites.immae.temp.enable = lib.mkEnableOption "enable Temp' website"; config = lib.mkIf cfg.enable { - services.websites.production.modules = [ "headers" ]; - services.websites.production.vhostConfs.temp = { + services.websites.env.production.modules = [ "headers" ]; + services.websites.env.production.vhostConfs.temp = { certName = "eldiron"; addToCerts = true; hosts = [ "temp.immae.eu" ]; -- cgit v1.2.3