From e0f0fd4a05e6d2a6b91ad81d096d023c70c49908 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Wed, 6 Jan 2021 17:43:00 +0100
Subject: [PATCH] Testing (#74)

* Add extra php dependencies (#73)
---
 README.md          | 2 +-
 README_fr.md       | 2 +-
 check_process      | 3 ---
 manifest.json      | 2 +-
 scripts/_common.sh | 2 ++
 scripts/install    | 2 +-
 scripts/restore    | 3 +++
 scripts/upgrade    | 9 +--------
 8 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/README.md b/README.md
index dadfba7..4e5f662 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 # DokuWiki for YunoHost
 
 [![Integration level](https://dash.yunohost.org/integration/dokuwiki.svg)](https://dash.yunohost.org/appci/app/dokuwiki) ![](https://ci-apps.yunohost.org/ci/badges/dokuwiki.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/dokuwiki.maintain.svg)  
-[![Install DokuWiki with YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=dokuwiki)
+[![Install DokuWiki with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=dokuwiki)
 
 *[Lire ce readme en français.](./README_fr.md)*
 
diff --git a/README_fr.md b/README_fr.md
index 0796ecc..6626ce5 100644
--- a/README_fr.md
+++ b/README_fr.md
@@ -1,7 +1,7 @@
 # DokuWiki pour YunoHost
 
 [![Niveau d'intégration](https://dash.yunohost.org/integration/dokuwiki.svg)](https://dash.yunohost.org/appci/app/dokuwiki) ![](https://ci-apps.yunohost.org/ci/badges/dokuwiki.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/dokuwiki.maintain.svg)  
-[![Installer DokuWiki avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=dokuwiki)
+[![Installer DokuWiki avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=dokuwiki)
 
 *[Read this readme in english.](./README.md)*
 
diff --git a/check_process b/check_process
index f6fdd01..5302a20 100644
--- a/check_process
+++ b/check_process
@@ -17,11 +17,8 @@
 		upgrade=1	from_commit=01add99d3d903ca6d07f863045edf2ba46cf18d5
 		backup_restore=1
 		multi_instance=1
-		incorrect_path=1
 		port_already_use=0
 		change_url=1
-;;; Levels
-	Level 5=auto
 ;;; Options
 Email=
 Notification=none
diff --git a/manifest.json b/manifest.json
index 80b7cd1..fb212b8 100644
--- a/manifest.json
+++ b/manifest.json
@@ -9,7 +9,7 @@
         "es": "Un sistema de Wiki de uso sencillicimo y compatible con los estándares.",
         "it": "Un Wiki aderente agli standard, semplice da usare, finalizzato principalmente alla creazione di documentazione di qualsiasi tipo."
     },
-    "version": "2020-07-29~ynh2",
+    "version": "2020-07-29~ynh3",
     "url": "https://www.dokuwiki.org",
     "license": "GPL-2.0-or-later",
     "maintainer": {
diff --git a/scripts/_common.sh b/scripts/_common.sh
index d7614e9..115991f 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -6,6 +6,8 @@
 
 YNH_PHP_VERSION="7.3"
 
+extra_php_dependencies="php${YNH_PHP_VERSION}-xml php${YNH_PHP_VERSION}-ldap php${YNH_PHP_VERSION}-gd"
+
 #=================================================
 # PERSONAL HELPERS
 #=================================================
diff --git a/scripts/install b/scripts/install
index 2066dad..b3dfdf5 100755
--- a/scripts/install
+++ b/scripts/install
@@ -83,7 +83,7 @@ ynh_system_user_create --username=$app
 ynh_script_progression --message="Configuring PHP-FPM..." --weight=2
 
 # Create a dedicated PHP-FPM config
-ynh_add_fpm_config
+ynh_add_fpm_config --package="$extra_php_dependencies"
 phpversion=$(ynh_app_setting_get --app=$app --key=phpversion)
 
 #=================================================
diff --git a/scripts/restore b/scripts/restore
index 8e49f15..213eb9f 100755
--- a/scripts/restore
+++ b/scripts/restore
@@ -89,9 +89,12 @@ chown -R $app:root $final_path/lib/tpl
 #=================================================
 # RESTORE THE PHP-FPM CONFIGURATION
 #=================================================
+ynh_script_progression --message="Reconfiguring PHP-FPM..." --weight=5
 
 ynh_restore_file --origin_path="/etc/php/$phpversion/fpm/pool.d/$app.conf"
 
+ynh_add_fpm_config --package="$extra_php_dependencies"
+
 #=================================================
 # RESTORE FAIL2BAN CONFIGURATION
 #=================================================
diff --git a/scripts/upgrade b/scripts/upgrade
index ec7de76..f87cc73 100755
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -151,13 +151,6 @@ ynh_clean_setup () {
 # Exit if an error occurs during the execution of the script
 ynh_abort_if_errors
 
-#=================================================
-# CHECK THE PATH
-#=================================================
-
-# Normalize the URL path syntax
-path_url=$(ynh_normalize_url_path --path_url=$path_url)
-
 #=================================================
 # STANDARD UPGRADE STEPS
 #=================================================
@@ -194,7 +187,7 @@ ynh_system_user_create --username=$app
 ynh_script_progression --message="Upgrading PHP-FPM configuration..."
 
 # Create a dedicated PHP-FPM config
-ynh_add_fpm_config
+ynh_add_fpm_config --package="$extra_php_dependencies"
 
 #=================================================
 # SPECIFIC UPGRADE