[packages/wordpress] add authz for akismet, keep php flags in one place

[glen]

commit 458d4036727fcfb3467b4a0fc87e2bb5f5a338cd
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Wed Sep 3 11:05:11 2014 +0300

    add authz for akismet, keep php flags in one place

 apache.conf | 27 +++++++++++++++++++--------
 1 file changed, 19 insertions(+), 8 deletions(-)
---
diff --git a/apache.conf b/apache.conf
index 5b48c98..630f853 100644
--- a/apache.conf
+++ b/apache.conf
@@ -1,6 +1,11 @@
 Alias /wordpress /usr/share/wordpress
 
 <Directory /usr/share/wordpress>
+	php_admin_flag engine on
+	php_admin_value open_basedir "/usr/share/wordpress:/etc/webapps/wordpress:/usr/share/php:/tmp"
+	php_admin_value upload_tmp_dir /tmp
+	php_admin_value upload_max_filesize 10M
+
 	<IfModule mod_authz_core.c>
 		# Apache 2.4
 		Require all granted
@@ -9,9 +14,6 @@ Alias /wordpress /usr/share/wordpress
 		Allow from all
 	</IfModule>
 
-	php_admin_flag engine on
-	php_admin_value open_basedir "/usr/share/wordpress:/etc/webapps/wordpress:/usr/share/php:/tmp"
-
 	<IfModule mod_rewrite.c>
 		Options +FollowSymLinks
 		RewriteEngine On
@@ -24,10 +26,19 @@ Alias /wordpress /usr/share/wordpress
 
 # integrate wp-content/plugins/akismet/.htaccess
 <Directory /usr/share/wordpress/wp-content/plugins/akismet>
-	Order deny,allow
-	Deny from all
+	<IfModule !mod_authz_core.c>
+		Order deny,allow
+		Deny from all
 
-	<FilesMatch "^akismet\.(css|js)$">
-		Allow from all
-	</FilesMatch>
+		<FilesMatch "^akismet\.(css|js)$">
+			Allow from all
+		</FilesMatch>
+	</IfModule>
+	<IfModule mod_authz_core.c>
+		Require all denied
+
+		<FilesMatch "^akismet\.(css|js)$">
+			Require all granted
+		</FilesMatch>
+	</IfModule>
 </Directory>
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/wordpress.git/commitdiff/98efe33832ca9e3da1b376374727f18490ca97ab