From: Vincent Bernat <bernat@luffy.cx>
Date: Tue, 15 Apr 2008 06:22:45 +0000 (+0000)
Subject: Comment by default Alias directive for tinymce
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=1638f8eedf9ae8a77a7b85f7b46f206d3d0e946b;p=roundcube.git

Comment by default Alias directive for tinymce
---

diff --git a/debian/changelog b/debian/changelog
index cde4a3c..3b26f17 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+roundcube (0.1.1-2) unstable; urgency=low
+
+  * Comment by default Alias directive for tinymce in Apache configuration
+    file (Closes: #476162).
+
+ -- Vincent Bernat <bernat@luffy.cx>  Tue, 15 Apr 2008 08:20:47 +0200
+
 roundcube (0.1.1-1) unstable; urgency=low
 
   * New upstream release
diff --git a/debian/conf/apache.conf b/debian/conf/apache.conf
index a5e0562..79e3d41 100644
--- 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,10 +11,6 @@ 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