From 7050bd5894b859d4918b8552c55924185f90a22c Mon Sep 17 00:00:00 2001
From: VirtuBox <thomas@virtubox.net>
Date: Mon, 12 Oct 2020 10:20:03 +0200
Subject: [PATCH] Fix php8.0-cli issue

---
 CHANGELOG.md                     |  6 ++++++
 wo/cli/plugins/site_functions.py |  6 +++++-
 wo/core/variables.py             | 11 ++++-------
 3 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3048d3a..2380a7f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,13 +8,19 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 ### v3.9.x - [Unreleased]
 
+#### Added
+
+- Add avif (AV1 Image Format) support into Nginx ([PR #314](https://github.com/WordOps/WordOps/pull/314))
+
 #### Changed
 
 - Use zstd instead of pigz for archive compression
+- Exclude Nginx_vts status page from traffic calculation ([PR #294](https://github.com/WordOps/WordOps/pull/294))
 
 #### Fixed
 
 - fail2ban install without Nginx
+- Grant MySQL permissions on all MySQL/MariaDB variant ([PR #285](https://github.com/WordOps/WordOps/pull/285))
 
 ### v3.12.2 - 2020-05-15
 
diff --git a/wo/cli/plugins/site_functions.py b/wo/cli/plugins/site_functions.py
index 18beeda..e042342 100644
--- a/wo/cli/plugins/site_functions.py
+++ b/wo/cli/plugins/site_functions.py
@@ -219,7 +219,11 @@ def setupdatabase(self, data):
     Log.debug(self, "Setting up user privileges")
     try:
         WOMysql.execute(self,
-                        "grant select, insert, update, delete, create, drop, references, index, alter, create temporary tables, lock tables, execute, create view, show view, create routine, alter routine, event, trigger on `{0}`.* to `{1}`@`{2}`"
+                        "grant select, insert, update, delete, create, drop, "
+                        "references, index, alter, create temporary tables, "
+                        "lock tables, execute, create view, show view, "
+                        "create routine, alter routine, event, "
+                        "trigger on `{0}`.* to `{1}`@`{2}`"
                         .format(wo_db_name,
                                 wo_db_username, wo_mysql_grant_host))
     except StatementExcecutionError:
diff --git a/wo/core/variables.py b/wo/core/variables.py
index a8654a3..64def89 100644
--- a/wo/core/variables.py
+++ b/wo/core/variables.py
@@ -137,7 +137,9 @@ class WOVar():
                  "readline", "common",
                  "cli", "mbstring", "intl",
                  "bcmath", "mysql", "opcache",
-                 "zip", "xml", "soap"]
+                 "zip", "xml", "soap", "memcached",
+                 "imagick", "igbinary", "msgpack",
+                 "redis", "xdebug"]
     wo_php72 = []
     for module in wo_module:
         wo_php72 = wo_php72 + ["php7.2-{0}".format(module)]
@@ -150,12 +152,7 @@ class WOVar():
     for module in wo_module:
         wo_php74 = wo_php74 + ["php7.4-{0}".format(module)]
 
-    if not wo_platform_codename == 'focal':
-        wo_php_extra = ["php-memcached", "php-imagick", "php-igbinary",
-                        "graphviz", "php-xdebug", "php-msgpack", "php-redis"]
-    else:
-        wo_php_extra = ["php-imagick", "php-igbinary",
-                        "graphviz", "php-xdebug", "php-msgpack", "php-redis"]
+    wo_php_extra = ["graphviz"]
 
     wo_mysql = ["mariadb-server", "percona-toolkit"]
     if wo_distro == 'raspbian':