From e985f5778cb6e2e4d95da660967a2115f601dc04 Mon Sep 17 00:00:00 2001
From: Ludovic Poujol <lpoujol@evolix.fr>
Date: Wed, 2 Oct 2019 15:45:41 +0200
Subject: [PATCH] evoadmin-web: Put the php config at the right place for
 Buster

---
 CHANGELOG.md                       |  1 +
 webapps/evoadmin-web/tasks/web.yml | 13 +++++++++++--
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2604ac73..21a5c17f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -46,6 +46,7 @@ The **patch** part changes incrementally at each release.
 * nginx: fix munin fcgi not working (missing chmod 660 on logs)
 * roundcube: fix typo for roundcube vhost
 * tomcat: fix typo for default tomcat_version
+* evoadmin-web: Put the php config at the right place for Buster
 
 ### Security
 
diff --git a/webapps/evoadmin-web/tasks/web.yml b/webapps/evoadmin-web/tasks/web.yml
index 00ba55f6..2ac17f25 100644
--- a/webapps/evoadmin-web/tasks/web.yml
+++ b/webapps/evoadmin-web/tasks/web.yml
@@ -9,14 +9,23 @@
   notify: reload apache2
   when: ansible_distribution_release == "jessie"
 
-- name: "Set custom values for PHP config (Debian 9 or later)"
+- name: "Set custom values for PHP config (Debian 9)"
   ini_file:
     dest: /etc/php/7.0/apache2/conf.d/zzz-evolinux-custom.ini
     section: PHP
     option: "disable_functions"
     value: "shell-exec,system,passthru,putenv,popen"
   notify: reload apache2
-  when: ansible_distribution_major_version | version_compare('9', '>=')
+  when: ansible_distribution_major_version | version_compare('9', '=')
+
+- name: "Set custom values for PHP config (Debian 10)"
+  ini_file:
+    dest: /etc/php/7.3/apache2/conf.d/zzz-evolinux-custom.ini
+    section: PHP
+    option: "disable_functions"
+    value: "shell-exec,system,passthru,putenv,popen"
+  notify: reload apache2
+  when: ansible_distribution_major_version | version_compare('10', '=')
 
 - name: Install evoadmin VHost
   template: