From 5e11d323aca6b3fd9f07e5f4ca35c67719d1a265 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Tue, 24 Mar 2020 11:58:47 +0100
Subject: cleanup httpd configuration

---
 phpMyAdmin.htaccess | 40 +++++++++-------------------------------
 1 file changed, 9 insertions(+), 31 deletions(-)

(limited to 'phpMyAdmin.htaccess')

diff --git a/phpMyAdmin.htaccess b/phpMyAdmin.htaccess
index 4ac6cb4..5854f10 100644
--- a/phpMyAdmin.htaccess
+++ b/phpMyAdmin.htaccess
@@ -11,52 +11,30 @@ Alias /phpmyadmin /usr/share/phpMyAdmin
 <Directory /usr/share/phpMyAdmin/>
    AddDefaultCharset UTF-8
 
-   <IfModule mod_authz_core.c>
-     # Apache 2.4
-     Require local
-   </IfModule>
-   <IfModule !mod_authz_core.c>
-     # Apache 2.2
-     Order Deny,Allow
-     Deny from All
-     Allow from 127.0.0.1
-     Allow from ::1
-   </IfModule>
+   Require local
 </Directory>
 
 <Directory /usr/share/phpMyAdmin/setup/>
-   <IfModule mod_authz_core.c>
-     # Apache 2.4
-     Require local
-   </IfModule>
-   <IfModule !mod_authz_core.c>
-     # Apache 2.2
-     Order Deny,Allow
-     Deny from All
-     Allow from 127.0.0.1
-     Allow from ::1
-   </IfModule>
+   Require local
 </Directory>
 
 # These directories do not require access over HTTP - taken from the original
 # phpMyAdmin upstream tarball
 #
 <Directory /usr/share/phpMyAdmin/libraries/>
-    Order Deny,Allow
-    Deny from All
-    Allow from None
+    Require all denied
+</Directory>
+
+<Directory /usr/share/phpMyAdmin/templates/>
+    Require all denied
 </Directory>
 
 <Directory /usr/share/phpMyAdmin/setup/lib/>
-    Order Deny,Allow
-    Deny from All
-    Allow from None
+    Require all denied
 </Directory>
 
 <Directory /usr/share/phpMyAdmin/setup/frames/>
-    Order Deny,Allow
-    Deny from All
-    Allow from None
+    Require all denied
 </Directory>
 
 # This configuration prevents mod_security at phpMyAdmin directories from
-- 
cgit