summaryrefslogtreecommitdiffstats
path: root/roles/webmail
diff options
context:
space:
mode:
authorGuilhem Moulin <guilhem@fripost.org>2015-05-31 04:02:00 +0200
committerGuilhem Moulin <guilhem@fripost.org>2015-06-07 02:53:54 +0200
commitb29601e313e8d35ec7edee343c82ca71ed6a3a12 (patch)
tree7b8cf31c97f405fe5b66c675256b962f2770b120 /roles/webmail
parentfa82a617a0c50b7478cd2b7189aa5f7d14449954 (diff)
Upgrade the webmail configuration from Wheezy to Jessie.
Diffstat (limited to 'roles/webmail')
-rw-r--r--roles/webmail/files/etc/nginx/sites-available/roundcube1
-rw-r--r--roles/webmail/tasks/roundcube.yml2
-rw-r--r--roles/webmail/templates/etc/postfix/main.cf.j27
3 files changed, 6 insertions, 4 deletions
diff --git a/roles/webmail/files/etc/nginx/sites-available/roundcube b/roles/webmail/files/etc/nginx/sites-available/roundcube
index 5bff410..8251841 100644
--- a/roles/webmail/files/etc/nginx/sites-available/roundcube
+++ b/roles/webmail/files/etc/nginx/sites-available/roundcube
@@ -47,6 +47,7 @@ server {
error_log /var/log/nginx/roundcube.error.log info;
index index.php;
+ client_max_body_size 64m;
location = /index.php {
include fastcgi/php;
include fastcgi/php-ssl;
diff --git a/roles/webmail/tasks/roundcube.yml b/roles/webmail/tasks/roundcube.yml
index 558f062..ebe93c8 100644
--- a/roles/webmail/tasks/roundcube.yml
+++ b/roles/webmail/tasks/roundcube.yml
@@ -33,7 +33,7 @@
- { var: default_port, value: "143" }
- { var: imap_auth_type, value: "'plain'" }
- { var: imap_cache, value: "null" }
- - { var: messages_cache, value: "FALSE" }
+ - { var: messages_cache, value: "null" }
# SMTP
- { var: smtp_server, value: "'localhost'" }
- { var: smtp_port, value: "2580" }
diff --git a/roles/webmail/templates/etc/postfix/main.cf.j2 b/roles/webmail/templates/etc/postfix/main.cf.j2
index 048302a..9d535c6 100644
--- a/roles/webmail/templates/etc/postfix/main.cf.j2
+++ b/roles/webmail/templates/etc/postfix/main.cf.j2
@@ -91,12 +91,13 @@ smtpd_sender_restrictions =
reject_non_fqdn_sender
reject_unknown_sender_domain
+smtpd_relay_restrictions =
+ permit_mynetworks
+ reject
+
smtpd_recipient_restrictions =
- # RFC requirements
reject_non_fqdn_recipient
reject_unknown_recipient_domain
- permit_mynetworks
- reject
smtpd_data_restrictions =
reject_unauth_pipelining