aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2011-05-09 10:32:29 -0300
committerSilvio Rhatto <rhatto@riseup.net>2011-05-09 10:32:29 -0300
commit2cded20232a1354d70f461a30bed0c035c0d77cd (patch)
treeeea0a4f75557ed91aaf9a564de7abddb4d5d144a
parent07b4f3be2c0992fdbf6bc90e03d031d07a86e4e6 (diff)
downloadpuppet-bootstrap-2cded20232a1354d70f461a30bed0c035c0d77cd.tar.gz
puppet-bootstrap-2cded20232a1354d70f461a30bed0c035c0d77cd.tar.bz2
Updating mail vhost
-rw-r--r--templates/apache/vhosts/mail.erb57
1 files changed, 48 insertions, 9 deletions
diff --git a/templates/apache/vhosts/mail.erb b/templates/apache/vhosts/mail.erb
index 1467c47..cd4a3f8 100644
--- 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 >