[packages/dokuwiki/DEVEL] migrate .htaccess contents to apache.conf

[glen]

commit 51769953dc6c6747d72c414383db14ba61391653
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Wed May 29 23:25:49 2013 +0300

    migrate .htaccess contents to apache.conf

 dokuwiki-apache.conf | 4 ++++
 dokuwiki.spec        | 7 ++++---
 2 files changed, 8 insertions(+), 3 deletions(-)
---
diff --git a/dokuwiki.spec b/dokuwiki.spec
index 059affc..00457ee 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.14
+Release:	0.15
 License:	GPL v2
 Group:		Applications/WWW
 Source0:	http://www.splitbrain.org/_media/projects/dokuwiki/%{name}-%{subver}.tgz
@@ -160,8 +160,9 @@ mv conf/acl.auth.php{.dist,}
 mv conf/users.auth.php{.dist,}
 mv conf/mysql.conf.php{.example,}
 
-find -name _dummy | xargs rm
-%{__rm} lib/index.html lib/plugins/index.html lib/images/index.html inc/lang/.htaccess conf/.htaccess
+find -name _dummy | xargs %{__rm}
+%{__rm} lib/index.html lib/plugins/index.html lib/images/index.html
+%{__rm} {conf,inc,bin,data,inc/lang}/.htaccess
 
 # we just don't package deleted files, these get removed automatically on rpm upgrades
 %{__rm} data/deleted.files
diff --git a/dokuwiki-apache.conf b/dokuwiki-apache.conf
index c195ca8..b79c953 100644
--- a/dokuwiki-apache.conf
+++ b/dokuwiki-apache.conf
@@ -23,3 +23,7 @@ Alias /dokuwiki /usr/share/dokuwiki
 		RewriteRule ^index.php$               doku.php
 	</IfModule>
 </Directory>
+
+<Directory ~ /usr/share/dokuwiki/(conf|inc|bin|data)>
+	Deny from all
+</Directory>
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/dokuwiki.git/commitdiff/51769953dc6c6747d72c414383db14ba61391653