apache 2.2/2.4 compatible config

[packages/phpMyAdmin.git] / apache.conf

diff --git a/phpMyAdmin.conf b/apache.conf
similarity index 61%
rename from phpMyAdmin.conf
rename to apache.conf
index 7ef24e8b1d5f1df6733e9fa19f557fc2be8f673d..1d7dbf371497167d511edde69958a303d38eafae 100644 (file)
--- a/phpMyAdmin.conf
+++ b/apache.conf
@@ -2,8 +2,17 @@ Alias /myadmin /usr/share/phpMyAdmin
 <Directory "/usr/share/phpMyAdmin">
        Options FollowSymLinks
        AllowOverride None
-       Order allow,deny
-       Allow from all
+
+       # 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>
+
        # uncomment if using apache-mod_php
        #php_admin_value open_basedir "/etc/webapps/phpMyAdmin/:/usr/share/phpMyAdmin/:/usr/share/phpMyAdmin/css/..:/tmp"
 </Directory>