roles/php5-fpm: Fix creation of pool configs for both tls and non-tls vhosts
Ansible's union thing only works on sets and lists, here we have a dict. Signed-off-by: Alan Orth <alan.orth@gmail.com>
This commit is contained in:
parent
b93da27fde
commit
6b528ecc92
@ -11,7 +11,15 @@
|
|||||||
|
|
||||||
- name: Copy php5-fpm pool config
|
- name: Copy php5-fpm pool config
|
||||||
template: src=pool.conf.j2 dest=/etc/php5/fpm/pool.d/{{ item.nginx_domain_name }}.conf owner=root group=root mode=0644
|
template: src=pool.conf.j2 dest=/etc/php5/fpm/pool.d/{{ item.nginx_domain_name }}.conf owner=root group=root mode=0644
|
||||||
with_items: nginx_vhosts | union(nginx_tls_vhosts)
|
with_items: nginx_vhosts
|
||||||
|
when: nginx_vhosts is defined
|
||||||
|
notify: restart php5-fpm
|
||||||
|
tags: php5-fpm
|
||||||
|
|
||||||
|
- name: Copy php5-fpm pool config
|
||||||
|
template: src=pool.conf.j2 dest=/etc/php5/fpm/pool.d/{{ item.nginx_domain_name }}.conf owner=root group=root mode=0644
|
||||||
|
with_items: nginx_tls_vhosts
|
||||||
|
when: nginx_tls_vhosts is defined
|
||||||
notify: restart php5-fpm
|
notify: restart php5-fpm
|
||||||
tags: php5-fpm
|
tags: php5-fpm
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user