Fix system geshi loading

[packages/dokuwiki.git] / dokuwiki-apache.conf

diff --git a/dokuwiki-apache.conf b/dokuwiki-apache.conf
index e11013ba1e490b7c930a00523be2f08b2918ca92..dad8b75f0baf80f3fbe5683e79bf218b750f72d2 100644 (file)
--- a/dokuwiki-apache.conf
+++ b/dokuwiki-apache.conf
@@ -1,12 +1,21 @@
 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
+
                ## $conf['userewrite'] = 1 - not needed for rewrite mode 2
                RewriteEngine on
 
-               ## Not all installations will require the following line.  If you do, 
+               ## Not all installations will require the following line.  If you do,
                ## change "/dokuwiki" to the path to your dokuwiki directory relative
                ## to your document root.
                RewriteBase /dokuwiki
@@ -21,3 +30,14 @@ Alias /dokuwiki /usr/share/dokuwiki
                RewriteRule ^index.php$               doku.php
        </IfModule>
 </Directory>
+
+<Directory ~ /usr/share/dokuwiki/(conf|inc|bin|data)>
+       <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>