From d351c1b2372c76a1bca04ff6f91935e0c30d0a3d Mon Sep 17 00:00:00 2001
From: Robin Sonnabend <robin@fsmpi.rwth-aachen.de>
Date: Fri, 21 Jun 2019 17:56:21 +0200
Subject: [PATCH] Update php-fpm role for buster

---
 php-fpm/handlers/main.yml |  2 +-
 php-fpm/tasks/main.yml    | 22 ++++++----------------
 php-fpm/vars/buster.yml   |  3 +++
 php-fpm/vars/jessie.yml   |  2 ++
 php-fpm/vars/stretch.yml  |  3 +++
 5 files changed, 15 insertions(+), 17 deletions(-)
 create mode 100644 php-fpm/vars/buster.yml
 create mode 100644 php-fpm/vars/jessie.yml
 create mode 100644 php-fpm/vars/stretch.yml

diff --git a/php-fpm/handlers/main.yml b/php-fpm/handlers/main.yml
index 710c0f6..27ebd57 100644
--- a/php-fpm/handlers/main.yml
+++ b/php-fpm/handlers/main.yml
@@ -2,4 +2,4 @@
 # file: php-fpm/handlers/main.yml
 
 - name: restart php-fpm
-  service: name=php7.0-fpm.service state=restarted
+  service: name="php{{php_version}}-fpm.service" state=restarted
diff --git a/php-fpm/tasks/main.yml b/php-fpm/tasks/main.yml
index a957c3e..e860994 100644
--- a/php-fpm/tasks/main.yml
+++ b/php-fpm/tasks/main.yml
@@ -1,36 +1,26 @@
 ---
 # file: php-fpm/tasks/main.yml
 
-- name: ensure php-fpm is installed on stretch
+- include_vars: "{{debian_version}}.yml"
+
+- name: ensure php-fpm is installed
   apt:
-    name: php-fpm
+    name: "{{php_fpm_pkgs}}"
     state: present
-  when: debian_version == "stretch"
   notify:
     - restart php-fpm
   tags:
     - php-fpm
     - webservices
 
-- name: ensure php-fpm is installed on jessie
-  apt:
-    name:
-      - php5
-      - php5-fpm
-    state: present
-  when: debian_version == "jessie"
-  tags:
-    - php-fpm
-    - webservices
-
 - name: ensure we have all the pools we want
   template:
     src: pool.conf.j2
-    dest: "/etc/php/7.0/fpm/pool.d/{{item.name}}.conf"
+    dest: "/etc/php/{{php_version}}/fpm/pool.d/{{item.name}}.conf"
     owner: root
     group: root
     mode: '0644'
-  when: debian_version == "stretch"
+  when: debian_version != "jessie"
   with_items: "{{fpm_pools|default([])}}"
   notify:
     - restart php-fpm
diff --git a/php-fpm/vars/buster.yml b/php-fpm/vars/buster.yml
new file mode 100644
index 0000000..ab784a0
--- /dev/null
+++ b/php-fpm/vars/buster.yml
@@ -0,0 +1,3 @@
+---
+php_fpm_pkgs: ["php-fpm"]
+php_version: "7.3"
diff --git a/php-fpm/vars/jessie.yml b/php-fpm/vars/jessie.yml
new file mode 100644
index 0000000..a191825
--- /dev/null
+++ b/php-fpm/vars/jessie.yml
@@ -0,0 +1,2 @@
+---
+php_fpm_pkgs: ["php-fpm5", "php5"]
diff --git a/php-fpm/vars/stretch.yml b/php-fpm/vars/stretch.yml
new file mode 100644
index 0000000..f072d5e
--- /dev/null
+++ b/php-fpm/vars/stretch.yml
@@ -0,0 +1,3 @@
+---
+php_fpm_pkgs: ["php-fpm"]
+php_version: "7.0"
-- 
GitLab