Handle incorrect upgrade from 0.3.1-6 when "changed" column already

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

diff --git a/debian/conf/apache.conf b/debian/conf/apache.conf
index 0ab1eb3175398d5e7e5936a9f87118fa5690d71c..f4befee5512ec542e394d860f2b216991d9882e7 100644 (file)
--- a/debian/conf/apache.conf
+++ b/debian/conf/apache.conf
@@ -1,10 +1,10 @@
 # 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/tinymce2/www/
+#    Alias /roundcube/program/js/tiny_mce/ /usr/share/tinymce/www/
 #    Alias /roundcube /var/lib/roundcube
 
-# Access to tinymce2 files
-<Directory "/usr/share/tinymce2/www/">
+# Access to tinymce files
+<Directory "/usr/share/tinymce/www/">
       Options Indexes MultiViews FollowSymLinks
       AllowOverride None
       Order allow,deny
@@ -12,10 +12,12 @@
 </Directory>
 
 <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: