[packages/dokuwiki: 14/14] apache <2.4/2.4 support

[glen]

commit 118123d2d8aa35bb8bccf03ec3c2756c41f25773
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Wed May 29 23:34:30 2013 +0300

    apache <2.4/2.4 support

 dokuwiki-apache.conf | 18 ++++++++++++++++--
 dokuwiki.spec        |  2 +-
 2 files changed, 17 insertions(+), 3 deletions(-)
---
diff --git a/dokuwiki.spec b/dokuwiki.spec
index 00457ee..55f765b 100644
--- a/dokuwiki.spec
+++ b/dokuwiki.spec
@@ -8,7 +8,7 @@ Summary:	PHP-based Wiki webapplication
 Summary(pl.UTF-8):	Aplikacja WWW Wiki oparta na PHP
 Name:		dokuwiki
 Version:	%{ver}
-Release:	0.15
+Release:	1
 License:	GPL v2
 Group:		Applications/WWW
 Source0:	http://www.splitbrain.org/_media/projects/dokuwiki/%{name}-%{subver}.tgz
diff --git a/dokuwiki-apache.conf b/dokuwiki-apache.conf
index b79c953..dad8b75 100644
--- a/dokuwiki-apache.conf
+++ b/dokuwiki-apache.conf
@@ -1,6 +1,13 @@
 Alias /dokuwiki /usr/share/dokuwiki
 <Directory /usr/share/dokuwiki/>
-	Allow from all
+	<IfModule mod_authz_core.c>
+		# Apache 2.4
+		Require all granted
+	</IfModule>
+	<IfModule !mod_authz_core.c>
+		Order allow,deny
+		Allow from all
+	</IfModule>
 
 	<IfModule mod_rewrite.c>
 		Options +FollowSymLinks
@@ -25,5 +32,12 @@ Alias /dokuwiki /usr/share/dokuwiki
 </Directory>
 
 <Directory ~ /usr/share/dokuwiki/(conf|inc|bin|data)>
-	Deny from all
+	<IfModule mod_authz_core.c>
+		# Apache 2.4
+		Require all denied
+	</IfModule>
+	<IfModule !mod_authz_core.c>
+		Order deny,allow
+		Deny from all
+	</IfModule>
 </Directory>
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/dokuwiki.git/commitdiff/118123d2d8aa35bb8bccf03ec3c2756c41f25773