From 119d774244847bb2b031af366ee921e811fc91a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?E=CC=81ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Mon, 14 Aug 2023 21:54:24 +0200
Subject: [PATCH] 2.1.17

---
 manifest.toml   | 10 +++++-----
 scripts/install |  5 -----
 scripts/remove  |  5 -----
 scripts/restore | 10 ++--------
 4 files changed, 7 insertions(+), 23 deletions(-)

diff --git a/manifest.toml b/manifest.toml
index a9c34c2..3c5cf4d 100644
--- a/manifest.toml
+++ b/manifest.toml
@@ -5,9 +5,9 @@ name = "Webtrees"
 description.en = "Web-based genealogy application"
 description.fr = "Logiciel libre de généalogie en ligne"
 
-version = "2.1.16~ynh2"
+version = "2.1.17~ynh1"
 
-maintainers = ["Anmol Sharma"]
+maintainers = [""]
 
 [upstream]
 license = "GPL-3.0-or-later"
@@ -17,7 +17,7 @@ admindoc = "https://wiki.webtrees.net"
 code = "https://github.com/fisharebest/webtrees"
 
 [integration]
-yunohost = ">= 11.1.19"
+yunohost = ">= 11.2"
 architectures = "all"
 multi_instance = true
 ldap = false
@@ -60,8 +60,8 @@ ram.runtime = "50M"
 
 [resources]
         [resources.sources.main]
-        url = "https://github.com/fisharebest/webtrees/releases/download/2.1.16/webtrees-2.1.16.zip"
-        sha256 = "3b5dc78b4a2abac37eebb8fca0bb1a21339ad1316ca5d269083725ba92ffaf54"
+        url = "https://github.com/fisharebest/webtrees/releases/download/2.1.17/webtrees-2.1.17.zip"
+        sha256 = "91599632d1887d268f3ea7ce549138db508aca84b60d0c74106b6968be00b381"
         autoupdate.strategy = "latest_github_tag"
 
     [resources.system_user]
diff --git a/scripts/install b/scripts/install
index 7caa598..3aca901 100755
--- a/scripts/install
+++ b/scripts/install
@@ -44,11 +44,6 @@ ynh_script_progression --message="Configuring NGINX web server..."
 # Create a dedicated NGINX config
 ynh_add_nginx_config
 
-#=================================================
-# PHP-FPM CONFIGURATION
-#=================================================
-ynh_script_progression --message="Configuring PHP-FPM..." 
-
 # Create a dedicated PHP-FPM config
 ynh_add_fpm_config --usage=low --footprint=low
 
diff --git a/scripts/remove b/scripts/remove
index 949c74b..2c04d62 100755
--- a/scripts/remove
+++ b/scripts/remove
@@ -17,11 +17,6 @@ ynh_script_progression --message="Removing NGINX web server configuration..."
 # Remove the dedicated NGINX config
 ynh_remove_nginx_config
 
-#=================================================
-# REMOVE PHP-FPM CONFIGURATION
-#=================================================
-ynh_script_progression --message="Removing PHP-FPM configuration"
-
 # Remove the dedicated PHP-FPM config
 ynh_remove_fpm_config
 
diff --git a/scripts/restore b/scripts/restore
index 026e1e2..3740315 100644
--- a/scripts/restore
+++ b/scripts/restore
@@ -9,14 +9,6 @@
 source ../settings/scripts/_common.sh
 source /usr/share/yunohost/helpers
 
-#=================================================
-# STANDARD RESTORATION STEPS
-#=================================================
-# RESTORE THE NGINX CONFIGURATION
-#=================================================
-
-ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf"
-
 #=================================================
 # RESTORE THE APP MAIN DIR
 #=================================================
@@ -34,6 +26,8 @@ ynh_script_progression --message="Restoring the PHP-FPM configuration..." --weig
 
 ynh_restore_file --origin_path="/etc/php/$phpversion/fpm/pool.d/$app.conf"
 
+ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf"
+
 #=================================================
 # RESTORE THE MYSQL DATABASE
 #=================================================