From 2d722f516829f5c0a5ef97f87846d3a49a6e7e80 Mon Sep 17 00:00:00 2001
From: Tim Moody <tim@timmoody.com>
Date: Sat, 25 Jan 2020 15:03:01 -0500
Subject: [PATCH] wait for php-fpm to be installed

---
 roles/httpd/tasks/php-stem.yml | 13 +------------
 roles/nginx/tasks/install.yml  | 15 +++++++++++++++
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/roles/httpd/tasks/php-stem.yml b/roles/httpd/tasks/php-stem.yml
index 1c5ced214..bcca59d1d 100644
--- a/roles/httpd/tasks/php-stem.yml
+++ b/roles/httpd/tasks/php-stem.yml
@@ -23,18 +23,7 @@
     remote_src: yes
   when: ansible_machine == "x86_64"
 
-- name: Create softlink 20-stem.ini to /etc/php/{{ php_version }}/mods-available/stem.ini
-  file:
-    src: "/etc/php/{{ php_version }}/mods-available/stem.ini"
-    path: "/etc/php/{{ php_version }}/fpm/conf.d/20-stem.ini"
-    state: link
-  when: nginx_enabled
-
-- name: Restart php{{ php_version }}-fpm service
-  service:
-    name: "php{{ php_version }}-fpm"
-    state: restarted
-  when: nginx_enabled
+# link to php done in nginx when php-fpm is installed
 
 # Not sure what to do for apache, so do nothing for now
 
diff --git a/roles/nginx/tasks/install.yml b/roles/nginx/tasks/install.yml
index d59224e0f..710b16eb4 100644
--- a/roles/nginx/tasks/install.yml
+++ b/roles/nginx/tasks/install.yml
@@ -28,6 +28,21 @@
     - { src: 'roles/nginx/templates/nginx.conf.j2', dest: '/etc/nginx/nginx.conf' }
     - { src: 'roles/nginx/templates/ports.conf.j2', dest: '/etc/{{ apache_service }}/ports.conf' }
 
+# php stem extension is installed in role httpd
+# here it is linked to php-fpm
+- name: Create softlink 20-stem.ini to /etc/php/{{ php_version }}/mods-available/stem.ini
+  file:
+    src: "/etc/php/{{ php_version }}/mods-available/stem.ini"
+    path: "/etc/php/{{ php_version }}/fpm/conf.d/20-stem.ini"
+    state: link
+  when: nginx_enabled
+
+- name: Restart php{{ php_version }}-fpm service
+  service:
+    name: "php{{ php_version }}-fpm"
+    state: restarted
+  when: nginx_enabled
+
 - name: "Add 'nginx_installed: True' to {{ iiab_state_file }}"
   lineinfile:
     dest: "{{ iiab_state_file }}"    # /etc/iiab/iiab_state.yml