[omd-commits] OMD Git: omd: Added Support for omd local directory structure for Dokuwiki

git version control git at mathias-kettner.de
Sat Sep 22 21:43:39 CEST 2012


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

Author:   Bastian Kuhn <bk at mathias-kettner.de>
Date:     Fri Sep 21 18:03:52 2012 +0200
Commiter: Bastian Kuhn <bk at mathias-kettner.de>
Date:     Fri Sep 21 18:03:52 2012 +0200

Added Support for omd local directory structure for Dokuwiki

---

 packages/dokuwiki/skel/etc/dokuwiki/apache.conf    |    9 +++++++++
 packages/dokuwiki/skel/etc/dokuwiki/local.php      |    2 ++
 2 files changed, 11 insertions(+), 0 deletions(-)

diff --git a/packages/dokuwiki/skel/etc/dokuwiki/apache.conf b/packages/dokuwiki/skel/etc/dokuwiki/apache.conf
index 8b6b7a8..940949b 100644
--- a/packages/dokuwiki/skel/etc/dokuwiki/apache.conf
+++ b/packages/dokuwiki/skel/etc/dokuwiki/apache.conf
@@ -1,5 +1,12 @@
 # SAMPLE CONFIG SNIPPETS FOR APACHE WEB SERVER
 
+Alias /###SITE###/wiki/local "/omd/sites/###SITE###/local/share/dokuwiki/htdocs"
+
+<Directory /omd/sites/###SITE###/local/share/dokuwiki/htdocs>
+      Order deny,allow
+      allow from all
+</Directory>
+
 Alias /###SITE###/wiki "/omd/sites/###SITE###/share/dokuwiki/htdocs"
 
 <Directory "/omd/sites/###SITE###/share/dokuwiki/htdocs">
@@ -7,6 +14,8 @@ Alias /###SITE###/wiki "/omd/sites/###SITE###/share/dokuwiki/htdocs"
    	Allow from all
 	<IfModule mod_rewrite.c>
 		RewriteEngine on
+                RewriteCond "/omd/sites/###SITE###/local/share/dokuwiki/htdocs/$1" "-f"
+                RewriteRule "(.*)" "/###SITE###/wiki/local/$1"
 		RewriteRule .* - [E=HTTP_AUTHORIZATION:%{HTTP:Authorization},L]
 	</IfModule>
 </Directory>
diff --git a/packages/dokuwiki/skel/etc/dokuwiki/local.php b/packages/dokuwiki/skel/etc/dokuwiki/local.php
index 0317994..d611b38 100644
--- a/packages/dokuwiki/skel/etc/dokuwiki/local.php
+++ b/packages/dokuwiki/skel/etc/dokuwiki/local.php
@@ -7,4 +7,6 @@ $conf['template']='arctic';
 $conf['tpl']['arctic']['left_sidebar_content'] = 'index';
 $conf['multisite']['authfile'] = '/omd/sites/###SITE###/var/check_mk/wato/auth/auth.php';
 $conf['multisite']['auth_secret'] = '/omd/sites/###SITE###/etc/auth.secret';
+$conf['tpl']['vector']['vector_navigation_location'] = 'sidebar';
+
 ?>
diff --git a/packages/dokuwiki/skel/share/dokuwiki/htdocs/.gitignore b/packages/dokuwiki/skel/share/dokuwiki/htdocs/.gitignore
new file mode 100644
index 0000000..e69de29



More information about the omd-commits mailing list