ISTI-ansible-roles
/
ansible-roles
4
0
Fork 3
Code Issues Pull Requests Releases Wiki Activity

Merge pull request 'Postfix: add some tags to the sasl related tasks.' (#191) from adellam/ansible-roles:master into master

This commit is contained in:
Andrea Dell'Amico 2020-04-25 17:28:31 +02:00
parent 7bea9c66c9 55822343bb
commit 91bc8b68da
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
library/roles/postfix/tasks/postfix-relay-server.yml
View File

@ -16,7 +16,7 @@
action: configfile path=/etc/default/saslauthd key=START value='yes' syntax=shell action: configfile path=/etc/default/saslauthd key=START value='yes' syntax=shell
when: ansible_distribution_file_variety == "Debian" when: ansible_distribution_file_variety == "Debian"
tags: [ 'postfix_relay', 'postfix-relay' ] tags: [ 'postfix_relay', 'postfix-relay', 'postfix_sasl' ]
- name: Postfix relay, rh specific - name: Postfix relay, rh specific
block: block:
@ -33,7 +33,7 @@
notify: restart saslauth daemon notify: restart saslauth daemon
when: ansible_distribution_file_variety == "RedHat" when: ansible_distribution_file_variety == "RedHat"
tags: [ 'postfix_relay', 'postfix-relay' ] tags: [ 'postfix_relay', 'postfix-relay', 'postfix_sasl' ]
- name: Postfix relay - name: Postfix relay
@ -52,5 +52,5 @@
- name: Ensure that the saslauthd daemon is started and enabled - name: Ensure that the saslauthd daemon is started and enabled
service: name=saslauthd state=restarted enabled=yes service: name=saslauthd state=restarted enabled=yes
tags: [ 'postfix_relay', 'postfix-relay' ] tags: [ 'postfix_relay', 'postfix-relay', 'postfix_sasl' ]

4
library/roles/postfix/tasks/smtp-sasl-auth.yml
View File

@ -3,9 +3,9 @@
template: src=sasl_passwd.j2 dest=/etc/postfix/sasl_passwd owner=root group=root mode=0400 template: src=sasl_passwd.j2 dest=/etc/postfix/sasl_passwd owner=root group=root mode=0400
when: postfix_use_sasl_auth | bool when: postfix_use_sasl_auth | bool
register: update_sasl_hash register: update_sasl_hash
tags: postfix-relay tags: [ 'postfix-relay', 'postfix_relay', 'postfix_sasl_client' ]
- name: Update SASL hash - name: Update SASL hash
shell: postmap hash:/etc/postfix/sasl_passwd shell: postmap hash:/etc/postfix/sasl_passwd
when: update_sasl_hash is changed when: update_sasl_hash is changed
tags: postfix-relay tags: [ 'postfix-relay', 'postfix_relay', 'postfix_sasl_client' ]