2 commits - docs/kolab-syncroton.conf

[Aleksander Machniak]

 docs/kolab-syncroton.conf |   39 ++++++++++++++++++++++++++++++---------
 1 file changed, 30 insertions(+), 9 deletions(-)

New commits:
commit e364866f45c02298862c7d60141c9e9aab6827d0
Merge: aec98e5 a1e19c6
Author: Aleksander Machniak <alec at alec.pl>
Date:   Mon Dec 2 09:07:30 2013 +0100

    Merge branch 'master' of ssh://git.kolab.org/git/kolab-syncroton



commit aec98e561de4a750055ad448b437d456ace5ac08
Author: Aleksander Machniak <alec at alec.pl>
Date:   Mon Dec 2 09:06:26 2013 +0100

    Support Apache > 2.2 syntax (Bug #2641)

diff --git a/docs/kolab-syncroton.conf b/docs/kolab-syncroton.conf
index 73371ac..00da7df 100644
--- a/docs/kolab-syncroton.conf
+++ b/docs/kolab-syncroton.conf
@@ -4,23 +4,44 @@
 ScriptAlias /Microsoft-Server-ActiveSync /usr/share/kolab-syncroton/index.php
 
 <Directory "/usr/share/kolab-syncroton/">
-    Order Allow,Deny
-    Allow from All
     AllowOverride All
+    <ifModule mod_authz_core.c>
+        Require all granted
+    </ifModule>
+    <ifModule !mod_authz_core.c>
+        Order Allow,Deny
+        Allow from All
+    </ifModule>
 </Directory>
 
 <Directory "/usr/share/kolab-syncroton/config/">
-    Order Deny,Allow
-    Deny from All
+    Options -FollowSymLinks
+    <ifModule mod_authz_core.c>
+        Require all denied
+    </ifModule>
+    <ifModule !mod_authz_core.c>
+        Order Deny,Allow
+        Deny from All
+    </ifModule>
 </Directory>
 
 <Directory "/usr/share/kolab-syncroton/lib/">
-    Order Deny,Allow
-    Deny from All
+    <ifModule mod_authz_core.c>
+        Require all denied
+    </ifModule>
+    <ifModule !mod_authz_core.c>
+        Order Deny,Allow
+        Deny from All
+    </ifModule>
 </Directory>
 
 <Directory "/usr/share/kolab-syncroton/logs/">
-    Order Deny,Allow
-    Deny from All
+    Options -FollowSymLinks
+    <ifModule mod_authz_core.c>
+        Require all denied
+    </ifModule>
+    <ifModule !mod_authz_core.c>
+        Order Deny,Allow
+        Deny from All
+    </ifModule>
 </Directory>
-