[omd-commits] OMD Git: omd: Moved authorization config from htaccess to conf-file

git version control git at mathias-kettner.de
Sun May 1 12:03:06 CEST 2011


Module:   omd
Branch:   master
Commit:   b98b0d21f5077f742a735d43c63fd1956862b7ab
URL:      http://omdistro.org/projects/omd/repository/revisions/b98b0d21f5077f742a735d43c63fd1956862b7ab

Author:   Stefan Hoesl <little at halelrtau.net>
Date:     Sun May  1 12:02:52 2011 +0200
Commiter: Stefan Hoesl <little at halelrtau.net>
Date:     Sun May  1 12:02:52 2011 +0200

Moved authorization config from htaccess to conf-file

---

 packages/dokuwiki/Makefile                      |    1 -
 packages/dokuwiki/htaccess                      |    4 ----
 packages/dokuwiki/skel/etc/dokuwiki/apache.conf |    5 ++++-
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/packages/dokuwiki/Makefile b/packages/dokuwiki/Makefile
index b3151f2..648775b 100644
--- a/packages/dokuwiki/Makefile
+++ b/packages/dokuwiki/Makefile
@@ -19,7 +19,6 @@ build:
 install:
 	mkdir -p $(DESTDIR)$(OMD_ROOT)/share/dokuwiki
 	cp preload.php $(DIR)/inc/
-	cp htaccess $(DIR)/.htaccess
 	touch $(DIR)/lib/plugins/plugin/disabled
 	touch $(DIR)/conf $(DIR)/data
 	rm -r $(DIR)/conf $(DIR)/data
diff --git a/packages/dokuwiki/htaccess b/packages/dokuwiki/htaccess
deleted file mode 100644
index 3961a05..0000000
--- a/packages/dokuwiki/htaccess
+++ /dev/null
@@ -1,4 +0,0 @@
-<IfModule mod_rewrite.c>
-     RewriteEngine on
-     RewriteRule .* - [E=HTTP_AUTHORIZATION:%{HTTP:Authorization},L]
-</IfModule>
diff --git a/packages/dokuwiki/skel/etc/dokuwiki/apache.conf b/packages/dokuwiki/skel/etc/dokuwiki/apache.conf
index 7d34627..8b6b7a8 100644
--- a/packages/dokuwiki/skel/etc/dokuwiki/apache.conf
+++ b/packages/dokuwiki/skel/etc/dokuwiki/apache.conf
@@ -3,7 +3,10 @@
 Alias /###SITE###/wiki "/omd/sites/###SITE###/share/dokuwiki/htdocs"
 
 <Directory "/omd/sites/###SITE###/share/dokuwiki/htdocs">
-	AllowOverride FileInfo
    	Order allow,deny
    	Allow from all
+	<IfModule mod_rewrite.c>
+		RewriteEngine on
+		RewriteRule .* - [E=HTTP_AUTHORIZATION:%{HTTP:Authorization},L]
+	</IfModule>
 </Directory>



More information about the omd-commits mailing list