From 750fe5a43b957b91a26069cf8a4fe19fc7b2633c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Isma=C3=ABl=20Bouya?= Date: Fri, 22 Oct 2021 20:07:14 +0200 Subject: Remove webappdirs --- modules/private/websites/isabelle/aten_integration.nix | 4 ++-- modules/private/websites/isabelle/aten_production.nix | 4 ++-- modules/private/websites/isabelle/iridologie.nix | 10 ++++------ 3 files changed, 8 insertions(+), 10 deletions(-) (limited to 'modules/private/websites/isabelle') diff --git a/modules/private/websites/isabelle/aten_integration.nix b/modules/private/websites/isabelle/aten_integration.nix index 899ee66..7e0aaf7 100644 --- a/modules/private/websites/isabelle/aten_integration.nix +++ b/modules/private/websites/isabelle/aten_integration.nix @@ -60,7 +60,7 @@ in { certName = "integration"; addToCerts = true; hosts = [ "dev.aten.pro" ]; - root = pcfg.webappDirs.isabelle_aten_integration; + root = app.webRoot; extraConfig = [ '' @@ -81,7 +81,7 @@ in { ErrorDocument 401 "" - + Options Indexes FollowSymLinks MultiViews Includes AllowOverride All Require all granted diff --git a/modules/private/websites/isabelle/aten_production.nix b/modules/private/websites/isabelle/aten_production.nix index b8d12b9..6a04710 100644 --- a/modules/private/websites/isabelle/aten_production.nix +++ b/modules/private/websites/isabelle/aten_production.nix @@ -61,7 +61,7 @@ in { certName = "isabelle"; certMainHost = "aten.pro"; hosts = [ "aten.pro" "www.aten.pro" ]; - root = pcfg.webappDirs.isabelle_aten_production; + root = app.webRoot; extraConfig = [ '' @@ -78,7 +78,7 @@ in { ErrorDocument 401 "" - + Options Indexes FollowSymLinks MultiViews Includes AllowOverride All Require all granted diff --git a/modules/private/websites/isabelle/iridologie.nix b/modules/private/websites/isabelle/iridologie.nix index decda36..88521fc 100644 --- a/modules/private/websites/isabelle/iridologie.nix +++ b/modules/private/websites/isabelle/iridologie.nix @@ -10,7 +10,6 @@ let apacheUser = config.services.httpd.Prod.user; apacheGroup = config.services.httpd.Prod.group; - webappdir = config.services.websites.webappDirsPaths.isabelle_iridologie; secretsPath = config.secrets.fullPaths."websites/isabelle/iridologie"; in { options.myServices.websites.isabelle.iridologie.enable = lib.mkEnableOption "enable Iridologie's website"; @@ -68,13 +67,12 @@ in { install -m 0750 -o ${apacheUser} -g ${apacheGroup} -d ${app.varDir}/phpSessions ''; }; - services.websites.webappDirs.isabelle_iridologie = app.webRoot; services.websites.env.production.modules = [ "proxy_fcgi" ]; services.websites.env.production.vhostConfs.isabelle_iridologie = { certName = "isabelle"; addToCerts = true; hosts = [ "iridologie.icommandeur.org" "icommandeur.org" "www.icommandeur.org" ]; - root = webappdir; + root = app.webRoot; extraConfig = [ '' RewriteEngine On @@ -89,16 +87,16 @@ in { SetHandler "proxy:unix:${config.services.phpfpm.pools.isabelle_iridologie.socket}|fcgi://localhost" - + DirectoryIndex index.php index.htm index.html Options -Indexes +FollowSymLinks +MultiViews +Includes - Include ${webappdir}/htaccess.txt + Include ${app.webRoot}/htaccess.txt AllowOverride AuthConfig FileInfo Limit Require all granted - + Require all denied -- cgit v1.2.3