Updating mail vhost

diff --git a/templates/apache/vhosts/mail.erb b/templates/apache/vhosts/mail.erb
index 1467c470a4ca33fc079d6b595e64e05e1a2579e7..cd4a3f83f2cbd62a9e9e7e2641c14e5aaa0c50a4 100644 (file)
--- a/templates/apache/vhosts/mail.erb
+++ b/templates/apache/vhosts/mail.erb
@@ -1,15 +1,10 @@
 # begin vhost for mail.<%= domain >
 <VirtualHost *:80>
-   ServerName mail.<%= domain >
-   DocumentRoot /usr/share/squirrelmail
+  ServerName mail.<%= domain >
+  #DocumentRoot /usr/share/squirrelmail
+  DocumentRoot /var/lib/roundcube
       
-   # begin mail config
-   <Directory /var/www/data/mail>
-      Options Indexes Includes FollowSymLinks MultiViews
-      AllowOverride All
-   </Directory>
-   # end mail config
-                                
+  # begin squirrel config
   <Directory /usr/share/squirrelmail>
     Options Indexes FollowSymLinks
     <IfModule mod_php4.c>
@@ -29,5 +24,49 @@
       allow from 127.0.0.1
     </Files>
   </Directory>
+  # end squirrel config
+
+  # begin roundcube config
+  # Access to tinymce files
+  Alias /roundcube /var/lib/roundcube
+  Alias /roundcube/program/js/tiny_mce/ /usr/share/tinymce/www/
+
+  <Directory "/usr/share/tinymce/www/">
+        Options Indexes MultiViews FollowSymLinks
+        AllowOverride None
+        Order allow,deny
+        allow from all
+  </Directory>
+  
+  <Directory /var/lib/roundcube/>
+    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:
+  <Directory /var/lib/roundcube/config>
+          Options -FollowSymLinks
+          AllowOverride None
+  </Directory>
+  
+  <Directory /var/lib/roundcube/temp>
+          Options -FollowSymLinks
+          AllowOverride None
+          Order allow,deny
+          Deny from all
+  </Directory>
+  
+  <Directory /var/lib/roundcube/logs>
+          Options -FollowSymLinks
+          AllowOverride None
+          Order allow,deny
+          Deny from all
+  </Directory>  
+  # end roundcube config
+
 </VirtualHost>
 # end vhost for mail.<%= domain >