From: Marcin Krol <hawk@tld-linux.org>
Date: Thu, 5 Jun 2014 06:19:31 +0000 (+0000)
Subject: - no apache 2.2 in TLD, revert config to apache 2.4 version only
X-Git-Url: https://git.tld-linux.org/?a=commitdiff_plain;h=fbfd79a300cde08f526d4f793f399ddbcb95342a;p=packages%2FphpMyAdmin.git

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

diff --git a/apache.conf b/apache.conf
index 1d7dbf3..bae0e7d 100644
--- a/apache.conf
+++ b/apache.conf
@@ -2,17 +2,7 @@ Alias /myadmin /usr/share/phpMyAdmin
 <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>