Merge "Do not use notify inside handlers"
This commit is contained in:
commit
9cf2985ca5
|
@ -17,7 +17,6 @@
|
||||||
shell: >-
|
shell: >-
|
||||||
cat {{ item_base_path ~ '.crt' }} $(test -f {{ item_base_path ~ '-ca.crt' }} &&
|
cat {{ item_base_path ~ '.crt' }} $(test -f {{ item_base_path ~ '-ca.crt' }} &&
|
||||||
echo {{ item_base_path ~ '-ca.crt' }}) {{ item_base_path ~ '.key' }} > {{ item_base_path ~ '.pem' }}
|
echo {{ item_base_path ~ '-ca.crt' }}) {{ item_base_path ~ '.key' }} > {{ item_base_path ~ '.pem' }}
|
||||||
notify: Reload haproxy
|
|
||||||
vars:
|
vars:
|
||||||
item_interface: "{{ item['interface'] | default('') }}"
|
item_interface: "{{ item['interface'] | default('') }}"
|
||||||
item_name: "{{ ('interface' in item and item['interface'] is truthy) | ternary(item['address'] ~ '-' ~ item_interface, item['address']) }}"
|
item_name: "{{ ('interface' in item and item['interface'] is truthy) | ternary(item['address'] ~ '-' ~ item_interface, item['address']) }}"
|
||||||
|
@ -35,7 +34,6 @@
|
||||||
mode: "0640"
|
mode: "0640"
|
||||||
owner: haproxy
|
owner: haproxy
|
||||||
group: haproxy
|
group: haproxy
|
||||||
notify: Reload haproxy
|
|
||||||
with_items: "{{ all_changed_results | map(attribute='item') | flatten | selectattr('name', 'defined') | map(attribute='name') | unique }}"
|
with_items: "{{ all_changed_results | map(attribute='item') | flatten | selectattr('name', 'defined') | map(attribute='name') | unique }}"
|
||||||
|
|
||||||
- name: Regenerate haproxy configuration
|
- name: Regenerate haproxy configuration
|
||||||
|
@ -46,7 +44,6 @@
|
||||||
mode: "0640"
|
mode: "0640"
|
||||||
owner: haproxy
|
owner: haproxy
|
||||||
group: haproxy
|
group: haproxy
|
||||||
notify: Reload haproxy
|
|
||||||
tags:
|
tags:
|
||||||
- haproxy-general-config
|
- haproxy-general-config
|
||||||
|
|
||||||
|
@ -70,3 +67,7 @@
|
||||||
state: "reloaded"
|
state: "reloaded"
|
||||||
enabled: yes
|
enabled: yes
|
||||||
daemon_reload: yes
|
daemon_reload: yes
|
||||||
|
listen:
|
||||||
|
- Regen pem
|
||||||
|
- Regenerate maps
|
||||||
|
- Regenerate haproxy configuration
|
||||||
|
|
Loading…
Reference in New Issue