Simplify the conditionals.

2020-10-18 19:55:02 +02:00 · 2020-10-18 19:55:02 +02:00 · 3d2e3a5c31
parent eb023ffecf
commit 3d2e3a5c31
2 changed files with 4 additions and 4 deletions
--- a/tasks/main.yml
+++ b/tasks/main.yml
@ -1,9 +1,7 @@
 ---
 - import_tasks: smtp-common-packages.yml
 - import_tasks: smtp-sasl-auth.yml
-  when:
-    - postfix_use_sasl_auth
-    - postfix_relay_client
+  when: postfix_relay_client
 - import_tasks: postfix-relay-server.yml
  when: postfix_relay_server
 - import_tasks: postfix-letsencrypt-hook.yml
--- a/tasks/smtp-sasl-auth.yml
+++ b/tasks/smtp-sasl-auth.yml
@ -7,5 +7,7 @@

 - name: Update SASL hash
  shell: postmap hash:/etc/postfix/sasl_passwd
-  when: update_sasl_hash is changed
+  when:
+    - update_sasl_hash is defined and update_sasl_hash is changed
+    - postfix_use_sasl_auth
  tags: postfix-relay