From 43f1633a22f4af06b63d6387cb01f69b8f3bc694 Mon Sep 17 00:00:00 2001
From: Markus Hauschild <markus@moepman.eu>
Date: Tue, 23 Jul 2019 12:00:59 +0200
Subject: [PATCH] cleanup roles

---
 roles/gogs/tasks/main.yml      |  2 +-
 roles/hackmd/tasks/main.yml    |  4 ++--
 roles/mail/tasks/main.yml      | 25 ++++++++-----------------
 roles/nextcloud/tasks/main.yml |  2 +-
 4 files changed, 12 insertions(+), 21 deletions(-)

diff --git a/roles/gogs/tasks/main.yml b/roles/gogs/tasks/main.yml
index c424bdd..96496c6 100644
--- a/roles/gogs/tasks/main.yml
+++ b/roles/gogs/tasks/main.yml
@@ -4,7 +4,7 @@
   apt: name=apt-transport-https
 
 - name: Enable gogs apt-key
-  apt_key: url='https://dl.packager.io/srv/pkgr/gogs/key'
+  apt_key: url="https://dl.packager.io/srv/pkgr/gogs/key"
 
 - name: Enable gogs repository
   apt_repository: repo="deb https://dl.packager.io/srv/deb/pkgr/gogs/pkgr/debian 9 main"
diff --git a/roles/hackmd/tasks/main.yml b/roles/hackmd/tasks/main.yml
index 766d7bf..51c4b69 100644
--- a/roles/hackmd/tasks/main.yml
+++ b/roles/hackmd/tasks/main.yml
@@ -7,10 +7,10 @@
   apt: name=apt-transport-https
 
 - name: Enable nodesource apt-key
-  apt_key: url='https://deb.nodesource.com/gpgkey/nodesource.gpg.key'
+  apt_key: url="https://deb.nodesource.com/gpgkey/nodesource.gpg.key"
 
 - name: Enable nodesource repository
-  apt_repository: repo='deb https://deb.nodesource.com/node_8.x stretch main'
+  apt_repository: repo="deb https://deb.nodesource.com/node_8.x/ {{ ansible_distribution_release }} main"
 
 - name: Install packages
   apt: name={{ item }}
diff --git a/roles/mail/tasks/main.yml b/roles/mail/tasks/main.yml
index 0ecbb42..6105189 100644
--- a/roles/mail/tasks/main.yml
+++ b/roles/mail/tasks/main.yml
@@ -1,18 +1,14 @@
 ---
+
 - name: add an apt rspamd key
-  apt_key:
-    url: https://rspamd.com/apt-stable/gpg.key
-    state: present
+  apt_key: url="https://rspamd.com/apt-stable/gpg.key"
 
 - name: add rspamd repository
-  apt_repository:
-    repo: deb http://rspamd.com/apt-stable/ {{ ansible_distribution_release }}  main
-    state: present
+  apt_repository: repo="deb http://rspamd.com/apt-stable/ {{ ansible_distribution_release }} main"
 
 - name: Install packages
   apt: name={{ item }}
   with_items:
-  - amavisd-new
   - bsd-mailx
   - dovecot-core
   - dovecot-imapd
@@ -45,7 +41,7 @@
 - name: Create vmail sieve-bin directory
   file: path=/var/vmail/.sieve/bin state=directory mode=0750 owner=vmail group=vmail
 
-- name: Copy redis config
+- name: Configure redis
   copy: src=redis.conf dest=/etc/redis/redis.conf
   notify: Restart redis
 
@@ -57,10 +53,10 @@
 - name: Render rspamd config templates
   template: src=rspamd/local.d/{{ item }}.j2 dest=/etc/rspamd/local.d/{{ item }}
   notify: Restart rspamd
-  loop:
-    - "options.inc"
-    - "arc.conf"
-    - "dkim_signing.conf"
+  with_items:
+  - options.inc
+  - arc.conf
+  - dkim_signing.conf
 
 - name: Copy spam learn/unlearn sieve and shell scripts
   copy: src=dovecot/{{ item }} dest=/var/vmail/.sieve/{{ item }}
@@ -164,20 +160,15 @@
 
 - name: Start dovecot
   service: name=dovecot state=started enabled=yes
-  tags: mail
 
 - name: Start fcgiwrap
   service: name=fcgiwrap state=started enabled=yes
-  tags: mail
 
 - name: Start postfix
   service: name=postfix state=started enabled=yes
-  tags: mail
 
 - name: Start redis
   service: name=rspamd state=started enabled=yes
-  tags: mail
 
 - name: Start rspamd
   service: name=rspamd state=started enabled=yes
-  tags: mail
diff --git a/roles/nextcloud/tasks/main.yml b/roles/nextcloud/tasks/main.yml
index 8d6ea2e..e73a78c 100644
--- a/roles/nextcloud/tasks/main.yml
+++ b/roles/nextcloud/tasks/main.yml
@@ -4,7 +4,7 @@
   apt: name=apt-transport-https
 
 - name: Enable sury php apt-key
-  apt_key: url='https://packages.sury.org/php/apt.gpg'
+  apt_key: url="https://packages.sury.org/php/apt.gpg"
 
 - name: Enable sury php repository
   apt_repository: repo="deb https://packages.sury.org/php/ stretch main"