Merge pull request #128 from Oefenweb/consistency-changes

Consistency changes

Author: tersmitten

.ansible-lint

@@ -1,7 +1,5 @@
 ---
 warn_list:
   - role-name
+  - name[play]
   - name[casing]
-  - '204'
-  - '405'
-  - '601'

.github/workflows/ci.yml

@@ -23,7 +23,9 @@ jobs:
           python-version: '3.x'
 
       - name: Install test dependencies
-        run: pip install ansible-lint[community,yamllint]
+        run: |
+          pip install ansible-lint
+          ansible-galaxy install -r requirements.yml
 
       - name: Lint code
         run: |
@@ -43,11 +45,8 @@ jobs:
       matrix:
         include:
           - distro: debian8
-            ansible-version: '<2.10'
           - distro: debian9
           - distro: debian10
-          - distro: ubuntu1604
-            ansible-version: '>=2.9, <2.10'
           - distro: ubuntu1604
             ansible-version: '>=2.10, <2.11'
           - distro: ubuntu1604
@@ -66,7 +65,7 @@ jobs:
           python-version: '3.x'
 
       - name: Install test dependencies
-        run: pip install 'ansible${{ matrix.ansible-version }}' molecule[docker] docker
+        run: pip install 'ansible${{ matrix.ansible-version }}' molecule-plugins[docker] docker
 
       - name: Run Molecule tests
         run: |

handlers/main.yml

@@ -1,54 +1,62 @@
 # handlers file
 ---
 - name: new aliases
-  command: >
+  ansible.builtin.command: >
     newaliases
   when: postfix_default_database_type != 'regexp'
+  changed_when: true
 
 - name: new virtual aliases
-  command: >
+  ansible.builtin.command: >
     postmap {{ postfix_default_database_type }}:{{ postfix_virtual_aliases_file }}
   when: postfix_default_database_type != 'regexp'
+  changed_when: true
 
 - name: postmap sasl_passwd
-  command: >
+  ansible.builtin.command: >
     postmap {{ postfix_default_database_type }}:{{ postfix_sasl_passwd_file }}
   when: postfix_default_database_type != 'regexp'
+  changed_when: true
 
 - name: postmap sender_canonical_maps
-  command: >
+  ansible.builtin.command: >
     postmap {{ postfix_sender_canonical_maps_database_type }}:{{ postfix_sender_canonical_maps_file }}
   when: postfix_sender_canonical_maps_database_type != 'regexp'
+  changed_when: true
 
 - name: postmap recipient_canonical_maps
-  command: >
+  ansible.builtin.command: >
     postmap {{ postfix_recipient_canonical_maps_database_type }}:{{ postfix_recipient_canonical_maps_file }}
   when: postfix_recipient_canonical_maps_database_type != 'regexp'
+  changed_when: true
 
 - name: postmap transport_maps
-  command: >
+  ansible.builtin.command: >
     postmap {{ postfix_transport_maps_database_type }}:{{ postfix_transport_maps_file }}
   when: postfix_transport_maps_database_type != 'regexp'
+  changed_when: true
 
 - name: postmap sender_dependent_relayhost_maps
-  command: >
+  ansible.builtin.command: >
     postmap {{ postfix_default_database_type }}:{{ postfix_sender_dependent_relayhost_maps_file }}
   when: postfix_default_database_type != 'regexp'
+  changed_when: true
 
 - name: postmap generic
-  command: >
+  ansible.builtin.command: >
     postmap {{ postfix_smtp_generic_maps_database_type }}:{{ postfix_smtp_generic_maps_file }}
   when: postfix_smtp_generic_maps_database_type != 'regexp'
+  changed_when: true
 
 - name: remove pid
-  file:
+  ansible.builtin.file:
     path: "~postfix/pid/master.pid"
     state: absent
   listen: restart postfix
   when: is_docker_guest
 
 - name: restart service
-  service:
+  ansible.builtin.service:
     name: postfix
     state: restarted
   listen: restart postfix

tasks/main.yml

@@ -1,15 +1,15 @@
 # tasks file
 ---
 - name: facts | set
-  set_fact:
+  ansible.builtin.set_fact:
     is_docker_guest: "{{ ansible_virtualization_role | default('host') == 'guest' and ansible_virtualization_type | default('none') == 'docker' }}"
   tags:
     - configuration
     - postfix
     - postfix-facts
 
 - name: configure debconf
-  debconf:
+  ansible.builtin.debconf:
     name: "{{ item.name }}"
     question: "{{ item.question }}"
     value: "{{ item.value }}"
@@ -21,7 +21,7 @@
     - postfix-install
 
 - name: install package
-  apt:
+  ansible.builtin.apt:
     name: "{{ postfix_install }}"
     state: "{{ apt_install_state | default('latest') }}"
     update_cache: true
@@ -32,7 +32,7 @@
     - postfix-install
 
 - name: configure mailname
-  template:
+  ansible.builtin.template:
     src: "{{ postfix_mailname_file.lstrip('/') }}.j2"
     dest: "{{ postfix_mailname_file }}"
     owner: root
@@ -45,7 +45,7 @@
     - postfix-mailname
 
 - name: update configuration file
-  template:
+  ansible.builtin.template:
     src: "{{ postfix_main_cf.lstrip('/') }}.j2"
     dest: "{{ postfix_main_cf }}"
     owner: root
@@ -58,7 +58,7 @@
     - postfix-configuration
 
 - name: configure sasl username/password
-  template:
+  ansible.builtin.template:
     src: "{{ postfix_sasl_passwd_file.lstrip('/') }}.j2"
     dest: "{{ postfix_sasl_passwd_file }}"
     owner: root
@@ -77,7 +77,7 @@
     - postfix-sasl-passwd
 
 - name: configure aliases
-  template:
+  ansible.builtin.template:
     src: "{{ postfix_aliases_file.lstrip('/') }}.j2"
     dest: "{{ postfix_aliases_file }}"
     owner: root
@@ -92,7 +92,7 @@
     - postfix-aliases
 
 - name: check if aliases.db exists
-  stat:
+  ansible.builtin.stat:
     path: "{{ postfix_aliases_file }}.db"
   register: _aliasesdb
   changed_when: not _aliasesdb.stat.exists
@@ -106,7 +106,7 @@
     - postfix-aliases
 
 - name: configure virtual aliases
-  lineinfile:
+  ansible.builtin.lineinfile:
     dest: "{{ postfix_virtual_aliases_file }}"
     regexp: '^{{ item.virtual | regex_escape }}\s.*'
     line: '{{ item.virtual }} {{ item.alias }}'
@@ -125,7 +125,7 @@
     - postfix-virtual-aliases
 
 - name: configure sender canonical maps
-  lineinfile:
+  ansible.builtin.lineinfile:
     dest: "{{ postfix_sender_canonical_maps_file }}"
     regexp: '^{{ item.sender | regex_escape }}\s.*'
     line: '{{ item.sender }} {{ item.rewrite }}'
@@ -144,7 +144,7 @@
     - postfix-sender-canonical-maps
 
 - name: configure recipient canonical maps
-  lineinfile:
+  ansible.builtin.lineinfile:
     dest: "{{ postfix_recipient_canonical_maps_file }}"
     regexp: '^{{ item.recipient | regex_escape }}\s.*'
     line: '{{ item.recipient }} {{ item.rewrite }}'
@@ -163,7 +163,7 @@
     - postfix-recipient-canonical-maps
 
 - name: configure transport maps
-  lineinfile:
+  ansible.builtin.lineinfile:
     dest: "{{ postfix_transport_maps_file }}"
     regexp: '^{{ item.pattern | regex_escape }}\s.*'
     line: '{{ item.pattern }} {{ item.result }}'
@@ -182,7 +182,7 @@
     - postfix-transport-maps
 
 - name: configure sender dependent relayhost maps
-  lineinfile:
+  ansible.builtin.lineinfile:
     dest: "{{ postfix_sender_dependent_relayhost_maps_file }}"
     regexp: '^{{ item.pattern | regex_escape }}\s.*'
     line: '{{ item.pattern }} {{ item.result }}'
@@ -201,7 +201,7 @@
     - postfix-sender-dependent-relayhost-maps
 
 - name: configure generic table
-  lineinfile:
+  ansible.builtin.lineinfile:
     dest: "{{ postfix_smtp_generic_maps_file }}"
     regexp: '^{{ item.pattern | regex_escape }}\s.*'
     line: '{{ item.pattern }} {{ item.result }}'
@@ -220,7 +220,7 @@
     - postfix-generic-table
 
 - name: configure header checks
-  template:
+  ansible.builtin.template:
     src: "{{ postfix_header_checks_file.lstrip('/') }}.j2"
     dest: "{{ postfix_header_checks_file }}"
     owner: root
@@ -234,7 +234,7 @@
     - postfix-header-checks-table
 
 - name: start and enable service
-  service:
+  ansible.builtin.service:
     name: postfix
     state: "{{ service_default_state | default('started') }}"
     enabled: "{{ service_default_enabled | default(true) | bool }}"