summaryrefslogtreecommitdiffstats
path: root/roles
diff options
context:
space:
mode:
authorGuilhem Moulin <guilhem@fripost.org>2014-01-15 07:56:00 +0100
committerGuilhem Moulin <guilhem@fripost.org>2015-06-07 02:51:39 +0200
commit8cca963be44becc5052da6f5ba1c1d7a705caaca (patch)
treecb9a13d4edad4069945fc08bddc7d51ce7c74160 /roles
parent9304813d505baaa50294ed0d37a11d9e3f0f6c79 (diff)
wibble
Diffstat (limited to 'roles')
-rw-r--r--roles/IMAP/tasks/imap.yml2
-rw-r--r--roles/webmail/files/etc/nginx/sites-available/roundcube2
-rw-r--r--roles/webmail/tasks/mail.yml5
3 files changed, 3 insertions, 6 deletions
diff --git a/roles/IMAP/tasks/imap.yml b/roles/IMAP/tasks/imap.yml
index 163e10d..5ed67da 100644
--- a/roles/IMAP/tasks/imap.yml
+++ b/roles/IMAP/tasks/imap.yml
@@ -28,7 +28,7 @@
owner=root group=root
mode=0755
with_items:
- - /
+ -
- /all
- /flagged
- /recent
diff --git a/roles/webmail/files/etc/nginx/sites-available/roundcube b/roles/webmail/files/etc/nginx/sites-available/roundcube
index 72f5a40..34f6420 100644
--- a/roles/webmail/files/etc/nginx/sites-available/roundcube
+++ b/roles/webmail/files/etc/nginx/sites-available/roundcube
@@ -8,7 +8,7 @@ server {
access_log /var/log/nginx/roundcube.access.log;
error_log /var/log/nginx/roundcube.error.log info;
- return 301 https://$http_host$request_uri;
+ return 301 https://$host$request_uri;
}
diff --git a/roles/webmail/tasks/mail.yml b/roles/webmail/tasks/mail.yml
index d3fb64e..4bf4363 100644
--- a/roles/webmail/tasks/mail.yml
+++ b/roles/webmail/tasks/mail.yml
@@ -1,8 +1,5 @@
- name: Install Postfix
- apt: pkg={{ item }}
- with_items:
- - postfix
- - postfix-pcre
+ apt: pkg=postfix
- name: Configure Postfix
template: src=etc/postfix/main.cf.j2