roles/postfix/handlers/main.yml

@@ -1,20 +1,20 @@
 ---
 - name: Reload s6-rc
-  ansible.builtin.service:
+  service:
     name: s6-rc
     state: reloaded
 
 - name: Restart Postfix
-  ansible.builtin.command: s6-svc -wU -T 5000 -ru {{ s6_scan_dir }}/postfix
+  command: s6-svc -wU -T 5000 -ru {{ s6_scan_dir }}/postfix
 
 - name: Restart Postfix log
-  ansible.builtin.command: s6-svc -wU -T 5000 -ru {{ s6_scan_dir }}/postfix-log
+  command: s6-svc -wU -T 5000 -ru {{ s6_scan_dir }}/postfix-log
 
 - name: Reload Postfix
-  ansible.builtin.command: s6-svc -h {{ s6_scan_dir }}/postfix
+  command: s6-svc -h {{ s6_scan_dir }}/postfix
 
 - name: Rebuild Postfix maps
-  ansible.builtin.command: 'postmap {{ item.type }}:{{ item.name }}'
+  command: 'postmap {{ item.type }}:{{ item.name }}'
   args:
     chdir: /usr/local/etc/postfix
   when: item.type in postfix_rebuild_types

roles/postfix/tasks/main.yml

@@ -1,27 +1,27 @@
 ---
 - name: Install Postfix
-  ansible.builtin.package:
+  package:
     name: postfix
     state: present
   notify:
     - Restart Postfix
 
 - name: Create /usr/local/etc/mail
-  ansible.builtin.file:
+  file:
     path: /usr/local/etc/mail
     state: directory
     owner: root
     group: wheel
-    mode: '0755'
+    mode: 0755
 
 - name: Install Postfix mailer.conf
-  ansible.builtin.copy:
+  copy:
     dest: /usr/local/etc/mail/mailer.conf
     src: /usr/local/share/postfix/mailer.conf.postfix
-    remote_src: true
+    remote_src: yes
     owner: root
     group: wheel
-    mode: '0644'
+    mode: 0644
 
 - name: Disable sendmail
   sysrc:
@@ -29,22 +29,22 @@
     value: NONE
 
 - name: Make sure sendmail is stopped
-  ansible.builtin.service:
+  service:
     name: sendmail
     state: stopped
 
-- ansible.core.name: Disable sendmail periodic tasks
-  ansible.builtin.lineinfile:
+- name: Disable sendmail periodic tasks
+  lineinfile:
     path: /etc/periodic.conf
     owner: root
     group: wheel
-    mode: '0444'
+    mode: 0444
     regexp: '^{{ item }}='
     line: '{{ item }}="NO"'
   with_items: '{{ sendmail_periodic }}'
 
 - name: Add /var/log/postfix to fstab
-  ansible.builtin.mount:
+  mount:
     path: /var/log/postfix
     src: tmpfs
     fstype: tmpfs
@@ -52,19 +52,19 @@
     state: mounted
 
 - name: Create Postfix service directories
-  ansible.builtin.file:
+  file:
     path: '{{ s6_etc_dir }}/service/{{ item }}'
     state: directory
     owner: root
     group: wheel
-    mode: '0755'
+    mode: 0755
   with_items: '{{ postfix_service_dirs }}'
 
 - name: Generate Postfix service scripts
-  ansible.builtin.template:
+  template:
     dest: '{{ s6_etc_dir }}/service/{{ item }}'
     src: '{{ item }}.j2'
-    mode: '0555'
+    mode: 0555
     owner: root
     group: wheel
   with_items: '{{ postfix_service_scripts }}'
@@ -73,24 +73,24 @@
     - Restart Postfix
 
 - name: Generate Postfix service configuration
-  ansible.builtin.copy:
+  copy:
     dest: '{{ s6_etc_dir }}/service/{{ item.name }}'
     content: '{{ item.content }}'
-    mode: '0444'
+    mode: 0444
     owner: root
     group: wheel
   loop_control:
-    label: '{{ item.name }} = {{ item.content }}'
+    label: '{{ item.name }} = {{ item.content }}'
   notify:
     - Reload s6-rc
     - Restart Postfix
   with_items: '{{ postfix_service_config }}'
 
 - name: Generate Postfix maps
-  ansible.builtin.template:
+  template:
     dest: '/usr/local/etc/postfix/{{ item.name }}'
     src: '{{ item.name }}.j2'
-    mode: '0444'
+    mode: 0444
     owner: root
     group: wheel
   with_items: '{{ postfix_maps }}'
@@ -99,7 +99,7 @@
     - Reload Postfix
 
 - name: Configure Postfix
-  ansible.corepostconf:
+  postconf:
     name: '{{ item.name }}'
     value: '{{ item.value | default(omit) }}'
     state: '{{ item.state | default(omit) }}'
@@ -108,7 +108,7 @@
     - Reload Postfix
 
 - name: Configure Postfix services
-  ansible.builtin.lineinfile:
+  lineinfile:
     path: /usr/local/etc/postfix/master.cf
     regexp: '^{{ item.name }} +{{ item.type }}'
     value: '{{ item.value }}'
@@ -126,15 +126,15 @@
     - Restart Postfix
 
 - name: Flush handlers
-  ansible.builtin.meta: flush_handlers
+  meta: flush_handlers
 
 - name: Start Postfix
-  ansible.builtin.command: fdmove -c 2 1 s6-rc -l {{ s6_live_dir }} -u -v 2 change postfix
+  command: fdmove -c 2 1 s6-rc -l {{ s6_live_dir }} -u -v 2 change postfix
   register: change
   changed_when: change.stdout | length > 0
 
 - name: Enable Postfix
-  ansible.builtin.lineinfile:
+  lineinfile:
     path: '{{ s6_etc_dir }}/service/enabled/contents'
     regexp: "^postfix$"
     line: "postfix"
@@ -142,4 +142,4 @@
     - Reload s6-rc
 
 - name: Flush handlers (again)
-  ansible.builtin.meta: flush_handlers
+  meta: flush_handlers

roles/postfix/vars/main.yml

@@ -353,14 +353,6 @@ postfix_config:
     value: 'aNULL'
     state: present
 
-  - name: smtpd_tls_mandatory_protocols
-    value: 'TLSv1.2 TLSv1.3'
-    state: present
-
-  - name: smtpd_tls_protocols
-    value: 'TLSv1.2 TLSv1.3'
-    state: present
-
   - name: smtpd_tls_received_header
     value: 'yes'
     state: present
@@ -378,7 +370,7 @@ postfix_config:
     state: present
 
   - name: tls_high_cipherlist
-    value: 'ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384'
+    value: 'EDH+CAMELLIA:EDH+aRSA:EECDH+aRSA+AESGCM:EECDH+aRSA+SHA256:EECDH:+CAMELLIA128:+AES128:+SSLv3:!aNULL:!eNULL:!LOW:!3DES:!MD5:!EXP:!PSK:!DSS:!RC4:!SEED:!IDEA:!ECDSA:kEDH:CAMELLIA128-SHA:AES128-SHA'
     state: present
 
   - name: tls_ssl_options