From cdab61bf56ae50564a055060947e01e7b79fe64a Mon Sep 17 00:00:00 2001
From: Olivier Navas <olivier@navas.rocks>
Date: Wed, 2 Mar 2022 14:08:21 +0100
Subject: [PATCH] changement macro checkmaintenance

---
 .../1_vhost_additional.conf.exemple               |  4 ++--
 templates/custom_reverse_proxy.conf               | 15 +++++----------
 2 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/files/vhosts.d.template/1_vhost_additional.conf.exemple b/files/vhosts.d.template/1_vhost_additional.conf.exemple
index 0139e53..074fe06 100644
--- a/files/vhosts.d.template/1_vhost_additional.conf.exemple
+++ b/files/vhosts.d.template/1_vhost_additional.conf.exemple
@@ -106,7 +106,7 @@
 #RewriteRule .* ws://%{SERVER_NAME}%{REQUEST_URI} [P,QSA,L]
 ## Soit parce que l'url demandée est d'une forme qui permet de détecter que le client s'adresse à une partie serveur développée avec des websockets
 #<Location /websockify>
-#  ProxyPass ws://$urlDest/websockify
-#  ProxyPassReverse ws://$vhostFQDN/websockify
+#  ProxyPass ws://${URL_DEST}/websockify
+#  ProxyPassReverse ws://${VHOST_FQDN}/websockify
 #</Location>
 
diff --git a/templates/custom_reverse_proxy.conf b/templates/custom_reverse_proxy.conf
index 1882d1f..bb05de7 100644
--- a/templates/custom_reverse_proxy.conf
+++ b/templates/custom_reverse_proxy.conf
@@ -170,7 +170,7 @@ SecCookieFormat 0
 </Macro>
 
 
-<Macro CheckMaintenancePage>
+<Macro CheckMaintenancePage $vhostFQDN>
   RewriteEngine On
 
   <Location "/rp_maintenance/auth/">
@@ -178,12 +178,12 @@ SecCookieFormat 0
   </Location>
 
   # Si on est en maintenance
-  <If "-f %{DOCUMENT_ROOT} . '/maintenance/${VHOST_FQDN}'">
+  <If "-f %{DOCUMENT_ROOT} . '/maintenance/$vhostFQDN'">
     RewriteCond %{REMOTE_ADDR} !127.0.0.1
     RewriteCond %{REQUEST_URI} !^/rp_ressources/*
     RewriteCond %{REQUEST_URI} !^/rp_maintenance/*
     RewriteCond %{HTTP_COOKIE} !rp_acces_maintenance=([^;]+)
-    RewriteRule ^.*$ %{DOCUMENT_ROOT}/maintenance/${VHOST_FQDN}
+    RewriteRule ^.*$ %{DOCUMENT_ROOT}/maintenance/$vhostFQDN
     Header Set Cache-Control "no-store"
   </If>
 </Macro>
@@ -219,8 +219,6 @@ SecCookieFormat 0
 <Macro vhost_HTTPS_Generic $vhostFQDN $cert $protoDest $urlDest $logPolicy $accessPolicy $indexingConf $modsecurityStatus>
 Use vhost_redirect_http-https $vhostFQDN
 
-Define VHOST_FQDN $vhostFQDN
-
 <Perl>
     if ( $cert eq "LE" )
     {
@@ -297,7 +295,7 @@ Define VHOST_FQDN $vhostFQDN
     Use ErrorDocumentPages 
 
     # Gestion de la page de maintenance
-    Use CheckMaintenancePage
+    Use CheckMaintenancePage $vhostFQDN
 
     # Gestion mod_security et inclusion des exceptions
     <IfModule mod_security2.c>
@@ -318,7 +316,6 @@ Define VHOST_FQDN $vhostFQDN
     </Perl>
 
 </VirtualHost>
-Undefine VHOST_FQDN
 </Macro>
 
 
@@ -326,7 +323,6 @@ Undefine VHOST_FQDN
 
 <Macro vhost_HTTP_Generic $vhostFQDN $protoDest $urlDest $logPolicy $accessPolicy $indexingConf $modsecurityStatus>
 
-Define VHOST_FQDN $vhostFQDN
 <VirtualHost *:80>
     <Perl>
         $ENV{'PERL_CONF_DEBUG'} and print "------- Generation du vhosts $vhostFQDN -------\n";
@@ -387,7 +383,7 @@ Define VHOST_FQDN $vhostFQDN
     Use ErrorDocumentPages 
 
     # Gestion de la page de maintenance
-    Use CheckMaintenancePage
+    Use CheckMaintenancePage $vhostFQDN
 
     # Gestion mod_security et inclusion des exceptions
     <IfModule mod_security2.c>
@@ -408,7 +404,6 @@ Define VHOST_FQDN $vhostFQDN
     </Perl>
 
 </VirtualHost>
-Undefine VHOST_FQDN
 </Macro>