From 434fe59a6329661e8c58b7fc1093f745417fb319 Mon Sep 17 00:00:00 2001
From: Alan Orth <alan.orth@gmail.com>
Date: Sun, 29 Apr 2018 16:04:03 +0300
Subject: [PATCH] roles/php-fpm: Use blocks to tag children of dynamic tasks

When using dynamic includes, child tasks do not inherit tags from their
parents. You must tag the parent and each child task separately, or use
a block to group children and then apply a tag to a block.

See: https://docs.ansible.com/ansible/devel/porting_guides/porting_guide_2.5.html
---
 roles/php-fpm/tasks/Ubuntu.yml       | 54 ++++++++++++++--------------
 roles/php-fpm/tasks/Ubuntu_18.04.yml | 54 ++++++++++++++--------------
 2 files changed, 54 insertions(+), 54 deletions(-)

diff --git a/roles/php-fpm/tasks/Ubuntu.yml b/roles/php-fpm/tasks/Ubuntu.yml
index 0fdebd6..a8939f5 100644
--- a/roles/php-fpm/tasks/Ubuntu.yml
+++ b/roles/php-fpm/tasks/Ubuntu.yml
@@ -1,34 +1,34 @@
 ---
-- name: Install php7.0-fpm and deps
-  apt: name={{ item }} state=present update_cache=yes
-  loop:
-    - php7.0-fpm
-    # for WordPress
-    - php7.0-mysql
-    - php7.0-gd
-    - php7.0-curl
-    # for Piwik
-    - php7.0-mbstring
-    - php7.0-xml
-  tags: php-fpm, packages
 
-# only copy php-fpm config for vhosts that need WordPress or PHP
-- name: Copy php-fpm pool config
-  template: src=php7.0-pool.conf.j2 dest=/etc/php/7.0/fpm/pool.d/{{ item.domain_name }}.conf owner=root group=root mode=0644
-  loop: "{{ nginx_vhosts }}"
-  when: (item.has_wordpress is defined and item.has_wordpress == True) or (item.needs_php is defined and item.needs_php == True)
-  notify: reload php7.0-fpm
-  tags: php-fpm
+- block:
+  - name: Install php7.0-fpm and deps
+    apt: name={{ item }} state=present update_cache=yes
+    loop:
+      - php7.0-fpm
+      # for WordPress
+      - php7.0-mysql
+      - php7.0-gd
+      - php7.0-curl
+      # for Piwik
+      - php7.0-mbstring
+      - php7.0-xml
+    tags: packages
 
-- name: Remove default www pool
-  file: path=/etc/php/7.0/fpm/pool.d/www.conf state=absent
-  notify: reload php7.0-fpm
-  tags: php-fpm
+  # only copy php-fpm config for vhosts that need WordPress or PHP
+  - name: Copy php-fpm pool config
+    template: src=php7.0-pool.conf.j2 dest=/etc/php/7.0/fpm/pool.d/{{ item.domain_name }}.conf owner=root group=root mode=0644
+    loop: "{{ nginx_vhosts }}"
+    when: (item.has_wordpress is defined and item.has_wordpress == True) or (item.needs_php is defined and item.needs_php == True)
+    notify: reload php7.0-fpm
 
-# re-configure php.ini
-- name: Update php.ini
-  template: src=php7.0-php.ini.j2 dest=/etc/php/7.0/fpm/php.ini owner=root group=root mode=0644
-  notify: reload php7.0-fpm
+  - name: Remove default www pool
+    file: path=/etc/php/7.0/fpm/pool.d/www.conf state=absent
+    notify: reload php7.0-fpm
+
+  # re-configure php.ini
+  - name: Update php.ini
+    template: src=php7.0-php.ini.j2 dest=/etc/php/7.0/fpm/php.ini owner=root group=root mode=0644
+    notify: reload php7.0-fpm
   tags: php-fpm
 
 # vim: set ts=2 sw=2:
diff --git a/roles/php-fpm/tasks/Ubuntu_18.04.yml b/roles/php-fpm/tasks/Ubuntu_18.04.yml
index 448be18..8a7517e 100644
--- a/roles/php-fpm/tasks/Ubuntu_18.04.yml
+++ b/roles/php-fpm/tasks/Ubuntu_18.04.yml
@@ -1,34 +1,34 @@
 ---
-- name: Install php-fpm and deps
-  apt: name={{ item }} state=present update_cache=yes
-  loop:
-    - php-fpm
-    # for WordPress
-    - php-mysql
-    - php-gd
-    - php-curl
-    # for Piwik
-    - php-mbstring
-    - php-xml
-  tags: php-fpm, packages
 
-# only copy php-fpm config for vhosts that need WordPress or PHP
-- name: Copy php-fpm pool config
-  template: src=php7.2-pool.conf.j2 dest=/etc/php/7.2/fpm/pool.d/{{ item.domain_name }}.conf owner=root group=root mode=0644
-  loop: "{{ nginx_vhosts }}"
-  when: (item.has_wordpress is defined and item.has_wordpress == True) or (item.needs_php is defined and item.needs_php == True)
-  notify: reload php7.2-fpm
-  tags: php-fpm
+- block:
+  - name: Install php-fpm and deps
+    apt: name={{ item }} state=present update_cache=yes
+    loop:
+      - php-fpm
+      # for WordPress
+      - php-mysql
+      - php-gd
+      - php-curl
+      # for Piwik
+      - php-mbstring
+      - php-xml
+    tags: packages
 
-- name: Remove default www pool
-  file: path=/etc/php/7.2/fpm/pool.d/www.conf state=absent
-  notify: reload php7.2-fpm
-  tags: php-fpm
+  # only copy php-fpm config for vhosts that need WordPress or PHP
+  - name: Copy php-fpm pool config
+    template: src=php7.2-pool.conf.j2 dest=/etc/php/7.2/fpm/pool.d/{{ item.domain_name }}.conf owner=root group=root mode=0644
+    loop: "{{ nginx_vhosts }}"
+    when: (item.has_wordpress is defined and item.has_wordpress == True) or (item.needs_php is defined and item.needs_php == True)
+    notify: reload php7.2-fpm
 
-# re-configure php.ini
-- name: Update php.ini
-  template: src=php7.2-php.ini.j2 dest=/etc/php/7.2/fpm/php.ini owner=root group=root mode=0644
-  notify: reload php7.2-fpm
+  - name: Remove default www pool
+    file: path=/etc/php/7.2/fpm/pool.d/www.conf state=absent
+    notify: reload php7.2-fpm
+
+  # re-configure php.ini
+  - name: Update php.ini
+    template: src=php7.2-php.ini.j2 dest=/etc/php/7.2/fpm/php.ini owner=root group=root mode=0644
+    notify: reload php7.2-fpm
   tags: php-fpm
 
 # vim: set ts=2 sw=2: