diff options
| author | Guilhem Moulin <guilhem@fripost.org> | 2014-01-15 07:56:00 +0100 |
|---|---|---|
| committer | Guilhem Moulin <guilhem@fripost.org> | 2015-06-07 02:51:39 +0200 |
| commit | 8cca963be44becc5052da6f5ba1c1d7a705caaca (patch) | |
| tree | cb9a13d4edad4069945fc08bddc7d51ce7c74160 | |
| parent | 9304813d505baaa50294ed0d37a11d9e3f0f6c79 (diff) | |
wibble
| -rw-r--r-- | roles/IMAP/tasks/imap.yml | 2 | ||||
| -rw-r--r-- | roles/webmail/files/etc/nginx/sites-available/roundcube | 2 | ||||
| -rw-r--r-- | roles/webmail/tasks/mail.yml | 5 |
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 @@ -11,41 +11,41 @@ - name: Create a user 'vmail' user: name=vmail system=yes home=/home/mail shell=/bin/false password=! state=present - name: Create a home directory for user 'vmail' file: path=/home/mail state=directory owner=vmail group=vmail mode=0700 - name: Create virtual mailbox directories file: path=/etc/dovecot/virtual{{ item }} state=directory owner=root group=root mode=0755 with_items: - - / + - - /all - /flagged - /recent - /unseen - name: Create virtual mailboxes copy: src=etc/dovecot/virtual/{{ item }}/dovecot-virtual dest=/etc/dovecot/virtual/{{ item }}/dovecot-virtual owner=root group=root mode=0644 with_items: - all - flagged - recent - unseen - name: Create directory /home/mail/spamspool # There is no possibility for a name clash, since 'spamspool' isn't a # valid domain file: path=/home/mail/spamspool 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 @@ -1,31 +1,31 @@ server { listen 80; listen [::]:80 ipv6only=on; server_name mail.fripost.org; 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; } server { listen 443; listen [::]:443 ipv6only=on; server_name mail.fripost.org; root /var/lib/roundcube; include ssl/config; ssl_certificate /etc/ssl/certs/ssl-cert-snakeoil.pem; ssl_certificate_key /etc/ssl/private/ssl-cert-snakeoil.key; location = /favicon.ico { root /usr/share/roundcube/skins/default/images; log_not_found off; access_log off; expires max; } 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,20 +1,17 @@ - name: Install Postfix - apt: pkg={{ item }} - with_items: - - postfix - - postfix-pcre + apt: pkg=postfix - name: Configure Postfix template: src=etc/postfix/main.cf.j2 dest=/etc/postfix-{{ postfix_instance[inst].name }}/main.cf owner=root group=root mode=0644 register: r notify: - Restart Postfix - name: Start Postfix service: name=postfix state=started when: not r.changed - meta: flush_handlers |