From 07a540cc8c46b7b0a87f5b92460ad8eb3e54bc75 Mon Sep 17 00:00:00 2001
From: Brice Waegeneire <brice@waegenei.re>
Date: Mon, 1 Feb 2021 11:13:16 +0100
Subject: [PATCH] Migrate away from apache access_compat to authz_host.

---
 scripts/vhost         |  7 +------
 scripts/vhost-default | 10 +++++-----
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/scripts/vhost b/scripts/vhost
index d5b8f4a..d72fcd9 100644
--- a/scripts/vhost
+++ b/scripts/vhost
@@ -29,14 +29,9 @@
         AuthName "Restricted"
         AuthUserFile HOME_DIR/XXX/.htpasswd
         AuthType Basic
-        require valid-user
-
-        Order Deny,Allow
-        Deny from all
+        Require valid-user
 
         #Include /etc/apache2/ipaddr_whitelist.conf
-
-        Satisfy any
     </Directory>
 
     # user - group (thanks to sesse@debian.org)
diff --git a/scripts/vhost-default b/scripts/vhost-default
index 891d25f..176f3d5 100755
--- a/scripts/vhost-default
+++ b/scripts/vhost-default
@@ -7,9 +7,9 @@
                 Options FollowSymLinks
                 AllowOverride None
 
-                Deny from all
-
-                #Allow from XXX.XXX.XXX.XXX
+                Require all denied
+                #Comment the previous directive when enabling the next
+                #Require ip XXX.XXX.XXX.XXX
         </Directory>
 
         <Directory /var/www/>
@@ -41,11 +41,11 @@
         #<Directory /usr/share/horde3>
         #       Options FollowSymLinks
         #       AllowOverride Limit
-        #       Allow from all
+        #       Require all granted
         #</Directory>
 
         <Files ~ "\.(inc|bak)$">
-                deny from all
+                Require all denied
         </Files>
 
 </VirtualHost>