From 2059989d8a7a9ff558816a2aa8fb652e66643e27 Mon Sep 17 00:00:00 2001
From: Adrien <adrien@reslinger.net>
Date: Tue, 2 Jun 2020 21:30:38 +0200
Subject: [PATCH] fix linter

---
 tasks/main.yml      | 17 ++++++++++++++---
 tasks/opendkim.yml  | 26 ++++++++++++++++++++++----
 tasks/opendmarc.yml | 19 ++++++++++++++++---
 tasks/postgrey.yml  | 12 ++++++++++--
 4 files changed, 62 insertions(+), 12 deletions(-)

diff --git a/tasks/main.yml b/tasks/main.yml
index 49715c3..1ed303c 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -8,11 +8,19 @@
     - postfix_mydestination is defined
 
 - name: install packages
-  package: name="{{ postfix_packages }}" state=latest update_cache=yes
+  package:
+    name: "{{ postfix_packages }}"
+    state: present
+    update_cache: yes
   notify: Restart postfix
 
 - name: Deploy templates
-  template: src=etc/postfix/{{ item }}.j2 dest=/etc/postfix/{{ item }} owner=root group=root mode=0644
+  template:
+    src: etc/postfix/{{ item }}.j2
+    dest: /etc/postfix/{{ item }}
+    owner: root
+    group: root
+    mode: 0644
   with_items:
     - main.cf
     - master.cf
@@ -74,7 +82,10 @@
     - postfix_mydestination is defined
 
 - name: Enable postfix at boot time
-  service: name=postfix enabled=yes state=started
+  service:
+    name: postfix
+    enabled: yes
+    state: started
   when:
     - postfix_mydestination is defined
 
diff --git a/tasks/opendkim.yml b/tasks/opendkim.yml
index 5c23361..57c75d6 100644
--- a/tasks/opendkim.yml
+++ b/tasks/opendkim.yml
@@ -3,10 +3,20 @@
 # Need EPEL repo
 
 - name: Make {{ postfix_mydomain }} keys directory
-  file: path=/etc/opendkim/keys/{{ postfix_mydomain }} state=directory owner=opendkim group=opendkim mode=0750
+  file:
+    path: /etc/opendkim/keys/{{ postfix_mydomain }}
+    state: directory
+    owner: opendkim
+    group: opendkim
+    mode: 0750
 
 - name: Install template config file
-  template: src=etc/{{ item }}.j2 dest=/etc/{{ item }} owner=opendkim group=opendkim mode=0640
+  template:
+    src: etc/{{ item }}.j2
+    dest: /etc/{{ item }}
+    owner: opendkim
+    group: opendkim
+    mode: 0640
   with_items:
     - opendkim.conf
     - opendkim/SigningTable
@@ -18,7 +28,12 @@
 # opendkim-genkey -D /etc/opendkim/keys/{{ postfix_mydomain }}/ -d {{ postfix_mydomain }} -s default
 
 - name: Copy specifics files
-  copy: src=etc/opendkim/keys/{{ postfix_mydomain }}/{{ item }} dest=/etc/opendkim/keys/{{ postfix_mydomain }}/{{ item }} owner=opendkim group=opendkim mode=0600
+  copy:
+    src: etc/opendkim/keys/{{ postfix_mydomain }}/{{ item }}
+    dest: /etc/opendkim/keys/{{ postfix_mydomain }}/{{ item }}
+    owner: opendkim
+    group: opendkim
+    mode: 0600
   with_items:
     - default.private
     - default.txt
@@ -27,5 +42,8 @@
 # Add /etc/opendkim/keys/{{ postfix_mydomain }}/default.txt in DNS zone
 
 - name: Enable OpenDKIM on boot
-  service: name=opendkim state=started enabled=yes
+  service:
+    name: opendkim
+    state: started
+    enabled: yes
 
diff --git a/tasks/opendmarc.yml b/tasks/opendmarc.yml
index 11e7be3..8b433eb 100644
--- a/tasks/opendmarc.yml
+++ b/tasks/opendmarc.yml
@@ -3,7 +3,12 @@
 # Need EPEL repo
 
 - name: Install template config file
-  template: src=etc/opendmarc.conf.j2 dest=/etc/opendmarc.conf owner=root group=root mode=0644
+  template:
+    src: etc/opendmarc.conf.j2
+    dest: /etc/opendmarc.conf
+    owner: root
+    group: root
+    mode: 0644
 
 - name: Install update public_suffix_list file for opendmarc
   get_url:
@@ -14,9 +19,17 @@
     mode: 0644
 
 - name: Install updater script
-  copy: src=etc/cron.weekly/opendmarc dest=/etc/cron.weekly/opendmarc owner=root group=root mode=0755
+  copy:
+    src: etc/cron.weekly/opendmarc
+    dest: /etc/cron.weekly/opendmarc
+    owner: root
+    group: root
+    mode: 0755
   notify: Restart OpenDMARC
 
 - name: Enable OpenDMARC on boot
-  service: name=opendmarc state=started enabled=yes
+  service:
+    name: opendmarc
+    state: started
+    enabled: yes
 
diff --git a/tasks/postgrey.yml b/tasks/postgrey.yml
index 61b9b86..7f40060 100644
--- a/tasks/postgrey.yml
+++ b/tasks/postgrey.yml
@@ -1,5 +1,13 @@
 - name: Install script to update  postgrey whitelist
-  copy: src=usr/local/sbin/update_postgrey_whitelist.sh dest=/usr/local/sbin/update_postgrey_whitelist.sh owner=root group=root mode=0755
+  copy:
+    src: usr/local/sbin/update_postgrey_whitelist.sh
+    dest: /usr/local/sbin/update_postgrey_whitelist.sh
+    owner: root
+    group: root
+    mode: 0755
 
 - name: Enable postgrey at boot time
-  service: name=postgrey enabled=yes state=started
+  service:
+    name: postgrey
+    enabled: yes
+    state: started