From 7fc260a17b8a6f0ca275ba3ac636114faf694d54 Mon Sep 17 00:00:00 2001
From: Ludovic Poujol <lpoujol@evolix.fr>
Date: Wed, 1 Apr 2020 18:08:57 +0200
Subject: [PATCH] (fix) php: update surry_post.yml to match current latest PHP
 release

---
 CHANGELOG.md            |  1 +
 php/tasks/sury_post.yml | 34 +++++++++++++++++-----------------
 2 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1adcc0fe..8236c283 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -106,6 +106,7 @@ The **patch** part changes incrementally at each release.
 * minifirewall: Properly detect alert5.sh to turn on firewall at boot
 * packweb-apache: Add missing dependency to evoacme role
 * php: Chose the debian version repo archive for packages.sury.org
+* php: update surry_post.yml to match current latest PHP release
 * packweb-apache: Don't try to install PHPMyAdmin on Buster as it's not available
 
 ### Removed
diff --git a/php/tasks/sury_post.yml b/php/tasks/sury_post.yml
index e26fbf8d..ecfb13dc 100644
--- a/php/tasks/sury_post.yml
+++ b/php/tasks/sury_post.yml
@@ -1,52 +1,52 @@
 ---
 
-- name: Symlink Evolix CLI config files from 7.3 to 7.0
+- name: Symlink Evolix CLI config files from 7.4 to 7.0
   file:
     src: "{{ item.src }}"
     dest: "{{ item.dest }}"
     force: yes
     state: link
   with_items:
-    - { src: "{{ php_cli_defaults_ini_file }}", dest: "/etc/php/7.3/cli/conf.d/z-evolinux-defaults.ini" }
-    - { src: "{{ php_cli_custom_ini_file }}", dest: "/etc/php/7.3/cli/conf.d/zzz-evolinux-custom.ini" }
+    - { src: "{{ php_cli_defaults_ini_file }}", dest: "/etc/php/7.4/cli/conf.d/z-evolinux-defaults.ini" }
+    - { src: "{{ php_cli_custom_ini_file }}", dest: "/etc/php/7.4/cli/conf.d/zzz-evolinux-custom.ini" }
 
-- name: Enforce permissions on PHP 7.3/cli directory
+- name: Enforce permissions on PHP 7.4/cli directory
   file:
-    dest: /etc/php/7.3/cli
+    dest: /etc/php/7.4/cli
     mode: "0755"
 
-- name: Symlink Evolix Apache config files from 7.3 to 7.0
+- name: Symlink Evolix Apache config files from 7.4 to 7.0
   file:
     src: "{{ item.src }}"
     dest: "{{ item.dest }}"
     force: yes
     state: link
   with_items:
-    - { src: "{{ php_apache_defaults_ini_file }}", dest: "/etc/php/7.3/apache2/conf.d/z-evolinux-defaults.ini" }
-    - { src: "{{ php_apache_custom_ini_file }}", dest: "/etc/php/7.3/apache2/conf.d/zzz-evolinux-custom.ini" }
+    - { src: "{{ php_apache_defaults_ini_file }}", dest: "/etc/php/7.4/apache2/conf.d/z-evolinux-defaults.ini" }
+    - { src: "{{ php_apache_custom_ini_file }}", dest: "/etc/php/7.4/apache2/conf.d/zzz-evolinux-custom.ini" }
   when: php_apache_enable
 
-- name: Enforce permissions on PHP 7.3/cli directory
+- name: Enforce permissions on PHP 7.4/cli directory
   file:
-    dest: /etc/php/7.3/apache2
+    dest: /etc/php/7.4/apache2
     mode: "0755"
   when: php_apache_enable
 
-- name: Symlink Evolix FPM config files from 7.3 to 7.0
+- name: Symlink Evolix FPM config files from 7.4 to 7.0
   file:
     src: "{{ item.src }}"
     dest: "{{ item.dest }}"
     force: yes
     state: link
   with_items:
-    - { src: "{{ php_fpm_defaults_ini_file }}", dest: "/etc/php/7.3/fpm/conf.d/z-evolinux-defaults.ini" }
-    - { src: "{{ php_fpm_custom_ini_file }}", dest: "/etc/php/7.3/fpm/conf.d/zzz-evolinux-custom.ini" }
-    - { src: "{{ php_fpm_defaults_conf_file }}", dest: "/etc/php/7.3/fpm/pool.d/z-evolinux-defaults.conf" }
-    - { src: "{{ php_fpm_custom_conf_file }}", dest: "/etc/php/7.3/fpm/pool.d/zzz-evolinux-custom.conf" }
+    - { src: "{{ php_fpm_defaults_ini_file }}", dest: "/etc/php/7.4/fpm/conf.d/z-evolinux-defaults.ini" }
+    - { src: "{{ php_fpm_custom_ini_file }}", dest: "/etc/php/7.4/fpm/conf.d/zzz-evolinux-custom.ini" }
+    - { src: "{{ php_fpm_defaults_conf_file }}", dest: "/etc/php/7.4/fpm/pool.d/z-evolinux-defaults.conf" }
+    - { src: "{{ php_fpm_custom_conf_file }}", dest: "/etc/php/7.4/fpm/pool.d/zzz-evolinux-custom.conf" }
   when: php_fpm_enable
 
-- name: Enforce permissions on PHP 7.3/cli directory
+- name: Enforce permissions on PHP 7.4/cli directory
   file:
-    dest: /etc/php/7.3/fpm
+    dest: /etc/php/7.4/fpm
     mode: "0755"
   when: php_fpm_enable