From a932640479cff4c19b8699f2a136ff4c1bee1e14 2020-05-07 18:00:36
From: Branko Majic <branko@majic.rs>
Date: 2020-05-07 18:00:36
Subject: [PATCH] MAR-152: Fix idempotence issues with web_server role:

- Reload configuration of PHP-FPM to ensure changes are picked-up.
- Install base packages for PHP applications prior to creating the
  directory containing unix socket files (so the package installation
  would not change them back).

---

diff --git a/roles/web_server/handlers/main.yml b/roles/web_server/handlers/main.yml
index 432f944a4ed81c454115e19b63720d0dcb0bf7f0..eb37ccbd5a810918ddcdfcb5a4855edb318ab49f 100644
--- a/roles/web_server/handlers/main.yml
+++ b/roles/web_server/handlers/main.yml
@@ -1,5 +1,9 @@
 ---
 
+- name: Reload systemd
+  systemd:
+    daemon_reload: true
+
 - name: Restart nginx
   service:
     name: nginx
diff --git a/roles/web_server/tasks/main.yml b/roles/web_server/tasks/main.yml
index 2966ad4f7e69296e320aa5123ee29f7910aaf69b..95a12d3e10794454ebd7ee0b6777ac909de7e7fd 100644
--- a/roles/web_server/tasks/main.yml
+++ b/roles/web_server/tasks/main.yml
@@ -136,6 +136,11 @@
       - virtualenvwrapper
     state: present
 
+- name: Install base packages for PHP web applications
+  apt:
+    name: "{{ php_fpm_package_name }}"
+    state: present
+
 - name: Create directories for storing per-site socket files
   file:
     path: "/run/{{ item }}"
@@ -160,11 +165,6 @@
     - socket_dir: php
       tmpfiles_d: "{{ php_fpm_service_name }}.conf"
 
-- name: Install base packages for PHP web applications
-  apt:
-    name: "{{ php_fpm_package_name }}"
-    state: present
-
 - name: Create directory for storing PHP-FPM service configuration overrides
   file:
     path: "/etc/systemd/system/{{ php_fpm_service_name }}.service.d/"
@@ -181,6 +181,7 @@
     group: root
     mode: 0644
   notify:
+    - Reload systemd
     - Restart PHP-FPM
 
 - name: Enable service used for running PHP web applications