From 29f8cb850d74b456d6481a456311bbf5361d328c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Isma=C3=ABl=20Bouya?= <ismael.bouya@normalesup.org>
Date: Sat, 1 Jun 2019 12:51:51 +0200
Subject: Refactor websites options

---
 modules/private/websites/florian/app.nix         | 4 ++--
 modules/private/websites/florian/integration.nix | 4 ++--
 modules/private/websites/florian/production.nix  | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'modules/private/websites/florian')

diff --git a/modules/private/websites/florian/app.nix b/modules/private/websites/florian/app.nix
index 55fb3cb..00fe644 100644
--- a/modules/private/websites/florian/app.nix
+++ b/modules/private/websites/florian/app.nix
@@ -21,8 +21,8 @@ in {
     services.phpfpm.poolConfigs.tellesflorian_dev = tellesflorian.phpFpm.pool;
     system.activationScripts.tellesflorian_dev = tellesflorian.activationScript;
     myServices.websites.webappDirs."${tellesflorian.apache.webappName}" = tellesflorian.app.webRoot;
-    services.websites.integration.modules = adminer.apache.modules ++ tellesflorian.apache.modules;
-    services.websites.integration.vhostConfs.tellesflorian = {
+    services.websites.env.integration.modules = adminer.apache.modules ++ tellesflorian.apache.modules;
+    services.websites.env.integration.vhostConfs.tellesflorian = {
       certName    = "eldiron";
       addToCerts  = true;
       hosts       = ["app.tellesflorian.com" ];
diff --git a/modules/private/websites/florian/integration.nix b/modules/private/websites/florian/integration.nix
index 424ebd4..e444e69 100644
--- a/modules/private/websites/florian/integration.nix
+++ b/modules/private/websites/florian/integration.nix
@@ -10,8 +10,8 @@ in {
   config = lib.mkIf cfg.enable {
     security.acme.certs."ftp".extraDomains."florian.immae.eu" = null;
 
-    services.websites.integration.modules = adminer.apache.modules;
-    services.websites.integration.vhostConfs.florian = {
+    services.websites.env.integration.modules = adminer.apache.modules;
+    services.websites.env.integration.vhostConfs.florian = {
       certName    = "eldiron";
       addToCerts  = true;
       hosts       = [ "florian.immae.eu" ];
diff --git a/modules/private/websites/florian/production.nix b/modules/private/websites/florian/production.nix
index 9b310b8..44a262e 100644
--- a/modules/private/websites/florian/production.nix
+++ b/modules/private/websites/florian/production.nix
@@ -10,8 +10,8 @@ in {
   config = lib.mkIf cfg.enable {
     security.acme.certs."ftp".extraDomains."tellesflorian.com" = null;
 
-    services.websites.production.modules = adminer.apache.modules;
-    services.websites.production.vhostConfs.florian = {
+    services.websites.env.production.modules = adminer.apache.modules;
+    services.websites.env.production.vhostConfs.florian = {
       certName     = "florian";
       certMainHost = "tellesflorian.com";
       hosts        = [ "tellesflorian.com" "www.tellesflorian.com" ];
-- 
cgit v1.2.3