From e117fa23c5e620fc1aa4ed1122c1d162e75e7c4d Mon Sep 17 00:00:00 2001
From: Timo Makinen <tmakinen@foo.sh>
Date: Fri, 4 Sep 2020 09:25:55 +0000
Subject: [PATCH] postfix: Lint fixes

---
 roles/postfix/tasks/main.yml | 136 +++++++++++++++++------------------
 1 file changed, 68 insertions(+), 68 deletions(-)

diff --git a/roles/postfix/tasks/main.yml b/roles/postfix/tasks/main.yml
index f1a15e1..fa4e616 100644
--- a/roles/postfix/tasks/main.yml
+++ b/roles/postfix/tasks/main.yml
@@ -43,86 +43,86 @@
     - mail_server is defined
 
 - block:
-  - name: install stunnel
-    package:
-      name: stunnel
-      state: installed
+    - name: install stunnel
+      package:
+        name: stunnel
+        state: installed
 
-  - name: create group smtps
-    group:
-      name: smtps
-      system: true
+    - name: create group smtps
+      group:
+        name: smtps
+        system: true
 
-  - name: create user smtps
-    user:
-      name: smtps
-      comment: Service Stunnel-SMTPS
-      createhome: false
-      group: smtps
-      home: /var/empty
-      shell: /sbin/nologin
-      system: true
- 
-  - name: create stunnel config
-    template:
-      src: stunnel.conf.j2
-      dest: /etc/stunnel/smtps.conf
-      mode: 0644
-      owner: root
-      group: "{{ ansible_wheel }}"
-    notify: restart stunnel-smtps
+    - name: create user smtps
+      user:
+        name: smtps
+        comment: Service Stunnel-SMTPS
+        createhome: false
+        group: smtps
+        home: /var/empty
+        shell: /sbin/nologin
+        system: true
 
-  - name: create stunnel systemd service
-    copy:
-      src: stunnel-smtps.service
-      dest: /etc/systemd/system/stunnel-smtps.service
-      mode: 0644
-      owner: root
-      group: "{{ ansible_wheel }}"
-    notify: restart stunnel-smtps
+    - name: create stunnel config
+      template:
+        src: stunnel.conf.j2
+        dest: /etc/stunnel/smtps.conf
+        mode: 0644
+        owner: root
+        group: "{{ ansible_wheel }}"
+      notify: restart stunnel-smtps
 
-  - name: enable stunnel service
-    service:
-      name: stunnel-smtps
-      state: started
-      enabled: true
+    - name: create stunnel systemd service
+      copy:
+        src: stunnel-smtps.service
+        dest: /etc/systemd/system/stunnel-smtps.service
+        mode: 0644
+        owner: root
+        group: "{{ ansible_wheel }}"
+      notify: restart stunnel-smtps
 
-  - name: configure relayhost
-    lineinfile:
-      path: /etc/postfix/main.cf
-      regexp: '^relayhost\s*='
-      insertafter: '^#relayhost\s*='
-      line: "relayhost = [localhost]:2525"
-    notify: restart postfix
+    - name: enable stunnel service
+      service:
+        name: stunnel-smtps
+        state: started
+        enabled: true
+
+    - name: configure relayhost
+      lineinfile:
+        path: /etc/postfix/main.cf
+        regexp: '^relayhost\s*='
+        insertafter: '^#relayhost\s*='
+        line: "relayhost = [localhost]:2525"
+      notify: restart postfix
 
   when:
     - ansible_distribution_major_version|int < 8
     - mail_server is defined
 
 - block:
-  - name: configure relayhost
-    lineinfile:
-      path: /etc/postfix/main.cf
-      regexp: '^relayhost\s*='
-      insertafter: '^#relayhost\s*='
-      line: "relayhost = [{{ mail_server }}]:465"
-    notify: restart postfix
- 
-  - name: configure smtp_tls_security_level
-    lineinfile:
-      path: /etc/postfix/main.cf
-      regexp: '^smtp_tls_security_level\s*='
-      insertafter: '^#?relayhost\s*='
-      line: "smtp_tls_security_level = encrypt"
-    notify: restart postfix
+    - name: configure relayhost
+      lineinfile:
+        path: /etc/postfix/main.cf
+        regexp: '^relayhost\s*='
+        insertafter: '^#relayhost\s*='
+        line: "relayhost = [{{ mail_server }}]:465"
+      notify: restart postfix
 
-  - name: configure smtp_tls_wrappermode
-    lineinfile:
-      path: /etc/postfix/main.cf
-      regexp: '^smtp_tls_wrappermode\s*='
-      insertafter: '^#?relayhost\s*='
-      line: "smtp_tls_wrappermode = yes"
-    notify: restart postfix
+    - name: configure smtp_tls_security_level
+      lineinfile:
+        path: /etc/postfix/main.cf
+        regexp: '^smtp_tls_security_level\s*='
+        insertafter: '^#?relayhost\s*='
+        line: "smtp_tls_security_level = encrypt"
+      notify: restart postfix
+
+    - name: configure smtp_tls_wrappermode
+      lineinfile:
+        path: /etc/postfix/main.cf
+        regexp: '^smtp_tls_wrappermode\s*='
+        insertafter: '^#?relayhost\s*='
+        line: "smtp_tls_wrappermode = yes"
+      notify: restart postfix
 
   when:
     - ansible_distribution_major_version|int >= 8