Mailserver cleanup, removed arm support.

roles/mailserver/handlers/main.yml

@@ -16,3 +16,6 @@
 
 - name: restart rspamd
   service: name=rspamd state=restarted
+
+- name: restart apache
+  service: name=apache2 state=restarted

roles/mailserver/tasks/autoconfig.yml

@@ -5,16 +5,32 @@
 #
 
 - name: Create directory for mail autoconfiguration virtualhost
-  file: state=directory path=/var/www/autoconfig group=www-data owner=root
+  file:
+    state=directory
+    path=/var/www/autoconfig
+    owner=root
+    group=www-data
 
 - name: Create directory holding the autoconfig XML file
-  file: state=directory path=/var/www/autoconfig/mail group=www-data owner=root
+  file:
+    state=directory
+    path=/var/www/autoconfig/mail
+    owner=root
+    group=www-data
 
 - name: Create the autoconfig XML file
-  template: src=var_www_autoconfig_mail_config-v1.1.j2 dest=/var/www/autoconfig/mail/config-v1.1.xml group=www-data owner=root
+  template:
+    src=var_www_autoconfig_mail_config-v1.1.j2
+    dest=/var/www/autoconfig/mail/config-v1.1.xml
+    owner=root
+    group=www-data
 
 - name: Configure the mail autoconfiguration virtualhost
-  template: src=etc_apache2_sites-available_autoconfig.j2 dest=/etc/apache2/sites-available/autoconfig.conf group=root owner=root
+  template:
+    src=etc_apache2_sites-available_autoconfig.j2
+    dest=/etc/apache2/sites-available/autoconfig.conf
+    owner=root
+    group=root
   notify: restart apache
 
 - name: Enable the mail autoconfiguration virtualhost

roles/mailserver/tasks/checkrbl.yml

@@ -1,5 +1,12 @@
 - name: Download check-rbl
-  get_url: url=https://raw.githubusercontent.com/lukecyca/check-rbl/e2bd60f5e5175375cd2f7f1b1b752473e3a23640/check-rbl.pl dest=/opt/check-rbl.pl sha256sum=22093bd59ed84cb7ee6e336fb2a4ab73dbe3a05837d2bab9b491a21df16b35d8
+  get_url:
+    url=https://raw.githubusercontent.com/lukecyca/check-rbl/e2bd60f5e5175375cd2f7f1b1b752473e3a23640/check-rbl.pl
+    dest=/opt/check-rbl.pl
+    sha256sum=22093bd59ed84cb7ee6e336fb2a4ab73dbe3a05837d2bab9b491a21df16b35d8
 
 - name: Install nightly check-rbl cronjob
-  cron: name="check-rbl" hour="2" minute="0" job="perl /opt/check-rbl.pl -i {{ ansible_default_ipv4.address }}"
+  cron:
+    name="check-rbl"
+    hour="3"
+    minute="0"
+    job="perl /opt/check-rbl.pl -i {{ ansible_default_ipv4.address }}"

roles/mailserver/tasks/dovecot.yml

@@ -1,6 +1,12 @@
+---
+# Installs and configures the Dovecot IMAP/POP3 server.
+
 - name: Install Dovecot and related packages
-  apt: pkg={{ item }} update_cache=yes state=present
-  with_items:
+  apt:
+    name: "{{ packages }}"
+    state: present
+  vars:
+    packages:
     - dovecot-core
     - dovecot-imapd
     - dovecot-lmtpd
@@ -11,38 +17,65 @@
   tags:
     - dependencies
 
-- name: Install Postgres for Dovecot
-  apt: pkg=postgresql state=present
-  tags:
-    - dependencies
-
 - name: Create vmail group
-  group: name=vmail state=present gid=5000
+  group:
+    name=vmail
+    state=present
+    gid=5000
 
 - name: Create vmail user
-  user: name=vmail group=vmail state=present uid=5000 home=/data shell=/usr/sbin/nologin
+  user:
+    name=vmail
+    group=vmail
+    state=present
+    uid=5000
+    home=/data
+    shell=/usr/sbin/nologin
 
 - name: Ensure mail domain directories are in place
-  file: state=directory path=/data/{{ item.name }} owner=vmail group=dovecot mode=0770
+  file:
+    state=directory
+    path=/data/{{ item.name }}
+    owner=vmail
+    group=dovecot
+    mode=0770
   with_items: '{{ virtual_domains }}'
 
 - name: Ensure mail directories are in place
-  file: state=directory path=/data/{{ item.domain }}/{{ item.account }} owner=vmail group=dovecot
+  file:
+    state=directory
+    path=/data/{{ item.domain }}/{{ item.account }}
+    owner=vmail
+    group=dovecot
   with_items: '{{ mail_virtual_users }}'
 
 - name: Copy dovecot.conf into place
-  copy: src=etc_dovecot_dovecot.conf dest=/etc/dovecot/dovecot.conf
+  copy:
+    src=etc_dovecot_dovecot.conf
+    dest=/etc/dovecot/dovecot.conf
 
 - name: Create before.d sieve scripts directory
-  file: path=/etc/dovecot/sieve/before.d state=directory owner=vmail group=dovecot recurse=yes mode=0770
+  file:
+    path=/etc/dovecot/sieve/before.d
+    state=directory
+    owner=vmail
+    group=dovecot
+    recurse=yes
+    mode=0770
   notify: restart dovecot
 
 - name: Configure sieve script moving spam into Junk folder
-  copy: src=etc_dovecot_sieve_before.d_no-spam.sieve dest=/etc/dovecot/sieve/before.d/no-spam.sieve owner=vmail group=dovecot
+  copy:
+    src=etc_dovecot_sieve_before.d_no-spam.sieve
+    dest=/etc/dovecot/sieve/before.d/no-spam.sieve
+    owner=vmail
+    group=dovecot
   notify: restart dovecot
 
 - name: Copy additional Dovecot configuration files in place
-  copy: src=etc_dovecot_conf.d_{{ item }} dest=/etc/dovecot/conf.d/{{ item }}
+  copy:
+    src=etc_dovecot_conf.d_{{ item }}
+    dest=/etc/dovecot/conf.d/{{ item }}
   with_items:
     - 10-auth.conf
     - 10-mail.conf
@@ -53,25 +86,30 @@
     - auth-sql.conf.ext
   notify: restart dovecot
 
-- name: Template 10-ssl.conf
-  template: src=etc_dovecot_conf.d_10-ssl.conf.j2 dest=/etc/dovecot/conf.d/10-ssl.conf
-  notify: restart dovecot
-
-- name: Template 15-lda.conf
-  template: src=etc_dovecot_conf.d_15-lda.conf.j2 dest=/etc/dovecot/conf.d/15-lda.conf
-  notify: restart dovecot
-
-- name: Template 20-imap.conf
-  template: src=etc_dovecot_conf.d_20-imap.conf.j2 dest=/etc/dovecot/conf.d/20-imap.conf
+- name: Template additional Dovecot configuration files
+  template:
+    src=etc_dovecot_conf.d_{{ item }}.j2
+    dest=/etc/dovecot/conf.d/{{ item }}
+  with_items:
+    - 10-ssl.conf
+    - 15-lda.conf
+    - 20-imap.conf
   notify: restart dovecot
 
 - name: Template dovecot-sql.conf.ext
-  template: src=etc_dovecot_dovecot-sql.conf.ext.j2 dest=/etc/dovecot/dovecot-sql.conf.ext
+  template:
+    src=etc_dovecot_dovecot-sql.conf.ext.j2
+    dest=/etc/dovecot/dovecot-sql.conf.ext
   notify: restart dovecot
 
 - name: Ensure correct permissions on Dovecot config directory
-  file: state=directory path=/etc/dovecot
-          group=dovecot owner=vmail mode=0770 recurse=yes
+  file:
+    state=directory
+    path=/etc/dovecot
+    group=dovecot
+    owner=vmail
+    mode=0770
+    recurse=yes
   notify: restart dovecot
 
 - name: Set firewall rules for dovecot

roles/mailserver/tasks/main.yml

@@ -1,3 +1,6 @@
+---
+# Installs and configures the mail system.
+
 - include: postfix.yml
   tags: postfix
 - include: dovecot.yml

roles/mailserver/tasks/rspamd.yml

@@ -2,51 +2,62 @@
 # Installs and configures the Rspamd spam filtering system.
 
 - name: Ensure repository key for Rspamd is in place
-  apt_key: url=https://rspamd.com/apt-stable/gpg.key state=present
-  when: ansible_architecture != "armv7l"
-  tags:
-    - dependencies
-
-- name: Ensure yunohost repository key for Rspamd is in place for ARM
-  apt_key: url=http://repo.yunohost.org/debian/yunohost.asc state=present
-  when: ansible_architecture == "armv7l"
+  apt_key:
+    url=https://rspamd.com/apt-stable/gpg.key
+    state=present
   tags:
     - dependencies
 
 - name: Add Rspamd repository
-  apt_repository: repo="deb https://rspamd.com/apt-stable/ {{ ansible_distribution_release }} main"
-  when: ansible_architecture != "armv7l"
-  tags:
-    - dependencies
-
-- name: Add yunohost Rspamd repository for ARM
-  apt_repository: repo="deb http://repo.yunohost.org/debian {{ ansible_distribution_release }} stable"
-  when: ansible_architecture == "armv7l"
+  apt_repository:
+    repo="deb https://rspamd.com/apt-stable/ {{ ansible_distribution_release }} main"
   tags:
     - dependencies
 
 - name: Install Rspamd and Redis
-  apt: pkg={{ item }} state=present update_cache=yes
-  with_items:
+  apt:
+    name: "{{ packages }}"
+    state: present
+  vars:
+    packages:
     - rspamd
     - redis-server
   tags:
     - dependencies
 
 - name: Copy DMARC configuration into place
-  template: src=etc_rspamd_local.d_dmarc.conf.j2 dest=/etc/rspamd/local.d/dmarc.conf owner=root group=root mode="0644"
+  template:
+    src=etc_rspamd_local.d_dmarc.conf.j2
+    dest=/etc/rspamd/local.d/dmarc.conf
+    owner=root
+    group=root
+    mode="0644"
   notify: restart rspamd
 
 - name: Configure Rspamd to use Redis
-  copy: src=etc_rspamd_local.d_redis.conf dest=/etc/rspamd/local.d/redis.conf owner=root group=root mode="0644"
+  copy:
+    src=etc_rspamd_local.d_redis.conf
+    dest=/etc/rspamd/local.d/redis.conf
+    owner=root
+    group=root
+    mode="0644"
   notify: restart rspamd
 
 - name: Copy DKIM configuration into place
-  copy: src=etc_rspamd_override.d_dkim_signing.conf dest=/etc/rspamd/override.d/dkim_signing.conf owner=root group=root mode="0644"
+  copy:
+    src=etc_rspamd_override.d_dkim_signing.conf
+    dest=/etc/rspamd/override.d/dkim_signing.conf
+    owner=root
+    group=root
+    mode="0644"
   notify: restart rspamd
 
 - name: Create dkim key directory
-  file: path=/var/lib/rspamd/dkim state=directory owner=_rspamd group=_rspamd
+  file:
+    path=/var/lib/rspamd/dkim
+    state=directory
+    owner=_rspamd
+    group=_rspamd
 
 - name: Generate DKIM keys
   shell: rspamadm dkim_keygen -s default -d {{ item.name }} -k {{ item.name }}.default.key > {{ item.name }}.default.txt
@@ -56,4 +67,6 @@
   with_items: "{{ virtual_domains }}"
 
 - name: Start redis
-  service: name=redis-server state=started
+  service:
+    name=redis-server
+    state=started

roles/mailserver/tasks/solr.yml

@@ -1,3 +1,6 @@
+---
+# Installs and configures the Solr full-text-search.
+
 - name: Install Solr and related packages
   apt: pkg={{ item }} state=present
   with_items: