From 7da3ceece7fe6c49046e97f37fc353db9b8a981c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Isma=C3=ABl=20Bouya?= <ismael.bouya@normalesup.org>
Date: Sat, 16 Feb 2019 14:50:08 +0100
Subject: Move production websites to use stable web directories

---
 nixops/modules/websites/chloe/chloe.nix   | 6 +++---
 nixops/modules/websites/chloe/default.nix | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'nixops/modules/websites/chloe')

diff --git a/nixops/modules/websites/chloe/chloe.nix b/nixops/modules/websites/chloe/chloe.nix
index 3b92af3..80e5554 100644
--- a/nixops/modules/websites/chloe/chloe.nix
+++ b/nixops/modules/websites/chloe/chloe.nix
@@ -56,16 +56,16 @@ let
           SetHandler "proxy:unix:${phpFpm.socket}|fcgi://localhost"
         </FilesMatch>
 
-        <Directory ${if environment == "dev" then root else webRoot}>
+        <Directory ${root}>
           DirectoryIndex index.php index.htm index.html
           Options -Indexes +FollowSymLinks +MultiViews +Includes
-          Include ${if environment == "dev" then root else webRoot}/htaccess.txt
+          Include ${root}/htaccess.txt
 
           AllowOverride AuthConfig FileInfo Limit
           Require all granted
         </Directory>
 
-        <DirectoryMatch "${if environment == "dev" then root else webRoot}/squelettes">
+        <DirectoryMatch "${root}/squelettes">
           Require all denied
         </DirectoryMatch>
 
diff --git a/nixops/modules/websites/chloe/default.nix b/nixops/modules/websites/chloe/default.nix
index d647eb9..f561834 100644
--- a/nixops/modules/websites/chloe/default.nix
+++ b/nixops/modules/websites/chloe/default.nix
@@ -53,7 +53,7 @@ in {
       services.myWebsites.production.vhostConfs.chloe = {
         certName    = "chloe";
         hosts       = ["osteopathe-cc.fr" "www.osteopathe-cc.fr" ];
-        root        = chloe_prod.webRoot;
+        root        = chloe_prod.apache.root;
         extraConfig = [ chloe_prod.apache.vhostConf ];
       };
     })
-- 
cgit v1.2.3