Imported Debian patch 0.5.2+dfsg-1

[roundcube.git] / debian / conf / apache.conf

diff --git a/debian/conf/apache.conf b/debian/conf/apache.conf
index a5e05623d3c99bcc1c3f928efdf8a086c3d03236..f4befee5512ec542e394d860f2b216991d9882e7 100644 (file)
--- a/debian/conf/apache.conf
+++ b/debian/conf/apache.conf
@@ -1,7 +1,9 @@
-# Uncomment this to use tinymce (you need tinymce package)
-# See README.Debian for more details
+# Those aliases do not work properly with several hosts on your apache server
+# Uncomment them to use it or adapt them to your configuration
+#    Alias /roundcube/program/js/tiny_mce/ /usr/share/tinymce/www/
+#    Alias /roundcube /var/lib/roundcube
 
-Alias /roundcube/program/js/tiny_mce/ /usr/share/tinymce/www/
+# Access to tinymce files
 <Directory "/usr/share/tinymce/www/">
       Options Indexes MultiViews FollowSymLinks
       AllowOverride None
@@ -9,15 +11,13 @@ Alias /roundcube/program/js/tiny_mce/ /usr/share/tinymce/www/
       allow from all
 </Directory>
 
-# This alias does not work properly with several hosts on your apache server
-# Uncomment it to use it
-#    Alias /roundcube /var/lib/roundcube
-
 <Directory /var/lib/roundcube/>
-        Options +FollowSymLinks
-        AllowOverride All
-        order allow,deny
-        allow from all
+  Options +FollowSymLinks
+  # This is needed to parse /var/lib/roundcube/.htaccess. See its
+  # content before setting AllowOverride to None.
+  AllowOverride All
+  order allow,deny
+  allow from all
 </Directory>
 
 # Protecting basic directories: