From cddfb4ad27fceaea98c4bd504450e38366dfdad2 Mon Sep 17 00:00:00 2001
From: Andrea Dell'Amico <andrea.dellamico@isti.cnr.it>
Date: Tue, 1 Sep 2020 13:40:01 +0200
Subject: [PATCH] Restart the service when it fails (default).

---
 defaults/main.yml                          | 1 +
 meta/main.yml                              | 4 ++--
 tasks/main.yml                             | 8 +++++++-
 templates/php-fpm.service.override.conf.j2 | 2 ++
 4 files changed, 12 insertions(+), 3 deletions(-)
 create mode 100644 templates/php-fpm.service.override.conf.j2

diff --git a/defaults/main.yml b/defaults/main.yml
index 85d7c3a..ba1881d 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -38,6 +38,7 @@ phpfpm_process_max: 256
 phpfpm_set_event_mechanism: False
 phpfpm_event_mechanism: epoll
 
+php_service_restart_policy: 'on-failure'
 
 # Pools settings
 phpfpm_default_pool_name: "php-fpm"
diff --git a/meta/main.yml b/meta/main.yml
index c2ee830..22fe74b 100644
--- a/meta/main.yml
+++ b/meta/main.yml
@@ -6,9 +6,9 @@ galaxy_info:
   license: license (EUPL)
   min_ansible_version: 2.7
   platforms:
-    - name: EL
+    - name: Ubuntu
       versions:
-        - 7
+        - bionic
   galaxy_tags:
     - php
     - php-fpm
diff --git a/tasks/main.yml b/tasks/main.yml
index c8d109e..ab99897 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -26,7 +26,7 @@
     notify: Reload php-fpm
 
   - name: Modify the global php settings
-    ini_file: dest={{ phpfpm_base_dir }}/php.ini section={{ item.section | default('PHP') }} option={{ item.option }} value={{ item.value }} backup=yes state={{ item.state | default('present') }}
+    ini_file: dest={{ phpfpm_base_dir }}/php.ini section={{ item.section | default('PHP') }} option={{ item.option }} value={{ item.value }} state={{ item.state | default('present') }}
     with_items: '{{ php_global_settings | default([]) }}'
     notify: Reload php-fpm
 
@@ -82,6 +82,12 @@
 
 - name: Manage the php-fpm service
   block:
+  - name: Create the systemd override directory
+    file: dest=/etc/systemd/system/php{{ php_version }}-fpm.service.d state=directory owner=root group=root mode='0755'
+
+  - name: Install the unit override file
+    template: php-fpm.service.override.conf.j2 dest=/etc/systemd/system/php{{ php_version }}-fpm.service.d/override.conf owner=root group=root mode='0644'
+    
   - name: Ensure that the php-fpm service is started and enabled
     service: name=php{{ php_version }}-fpm state=started enabled=yes
     when: phpfpm_service_enabled | bool
diff --git a/templates/php-fpm.service.override.conf.j2 b/templates/php-fpm.service.override.conf.j2
new file mode 100644
index 0000000..21c0e92
--- /dev/null
+++ b/templates/php-fpm.service.override.conf.j2
@@ -0,0 +1,2 @@
+[Service]
+Restart={{ php_service_restart_policy }}