- no apache 2.2 in TLD, revert config to apache 2.4 version only

diff --git a/apache.conf b/apache.conf
index 1d7dbf371497167d511edde69958a303d38eafae..bae0e7dba66ce48372ce46010f59503f0fa2ff8f 100644 (file)
--- a/apache.conf
+++ b/apache.conf
@@ -2,17 +2,7 @@ Alias /myadmin /usr/share/phpMyAdmin
 <Directory "/usr/share/phpMyAdmin">
        Options FollowSymLinks
        AllowOverride None
 <Directory "/usr/share/phpMyAdmin">
        Options FollowSymLinks
        AllowOverride None

-
-       # Apache 2.x
-       <IfModule !mod_authz_core.c>
-               Order allow,deny
-               Allow from all
-       </IfModule>
-       # Apache 2.4
-       <IfModule mod_authz_core.c>
-               Require all granted
-       </IfModule>
-
+       Require all granted

        # uncomment if using apache-mod_php
        #php_admin_value open_basedir "/etc/webapps/phpMyAdmin/:/usr/share/phpMyAdmin/:/usr/share/phpMyAdmin/css/..:/tmp"
 </Directory>
        # uncomment if using apache-mod_php
        #php_admin_value open_basedir "/etc/webapps/phpMyAdmin/:/usr/share/phpMyAdmin/:/usr/share/phpMyAdmin/css/..:/tmp"
 </Directory>