From 6b528ecc92f6cfa262415c228fa7bc02ab7fa3fa Mon Sep 17 00:00:00 2001 From: Alan Orth Date: Thu, 19 Feb 2015 19:41:48 +0300 Subject: [PATCH] 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 --- roles/php5-fpm/tasks/main.yml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/roles/php5-fpm/tasks/main.yml b/roles/php5-fpm/tasks/main.yml index 74c4a55..9386d75 100644 --- a/roles/php5-fpm/tasks/main.yml +++ b/roles/php5-fpm/tasks/main.yml @@ -11,7 +11,15 @@ - 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_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 tags: php5-fpm