From 2b59536b48bf23792d5f1e216535f5126e5f1d67 Mon Sep 17 00:00:00 2001
From: jarod5001 <68397534+jarod5001@users.noreply.github.com>
Date: Tue, 3 May 2022 21:06:26 +0200
Subject: [PATCH 1/7] Update manifest.json

---
 manifest.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifest.json b/manifest.json
index 942515f..4ffc5ed 100644
--- a/manifest.json
+++ b/manifest.json
@@ -6,7 +6,7 @@
         "en": "Web-based cross-platform XMPP client",
         "fr": "Client XMPP multiplateforme basé sur le Web"
     },
-    "version": "0.19~ynh3",
+    "version": "0.20~ynh1",
     "url": "https://movim.eu",
     "upstream": {
         "license": "AGPL-3.0-or-later",

From 17aef313ba6b564282cd3644eeec756ac06ede9f Mon Sep 17 00:00:00 2001
From: jarod5001 <68397534+jarod5001@users.noreply.github.com>
Date: Tue, 3 May 2022 21:07:13 +0200
Subject: [PATCH 2/7] 0.20

---
 conf/app.src | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/conf/app.src b/conf/app.src
index 1ddbcec..c59cd35 100644
--- a/conf/app.src
+++ b/conf/app.src
@@ -1,5 +1,5 @@
-SOURCE_URL=https://github.com/movim/movim/archive/v0.19.tar.gz
-SOURCE_SUM=df98b5b0df6fd6bfa5fda88f387ac017bc7bcead42c462745296604f3e0ee501
+SOURCE_URL=https://github.com/movim/movim/archive/refs/tags/v0.20.zip
+SOURCE_SUM=53bd3c7060455e353fc44b5996f4e5ae9b2181dc0ef44243a3edf87e0fbfdec2
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=tar.gz
 SOURCE_IN_SUBDIR=true

From 8a2c4460c5786fe4801b60c0f36343f71cef754e Mon Sep 17 00:00:00 2001
From: jarod5001 <68397534+jarod5001@users.noreply.github.com>
Date: Wed, 4 May 2022 14:25:42 +0200
Subject: [PATCH 3/7] Update app.src

---
 conf/app.src | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/conf/app.src b/conf/app.src
index c59cd35..511c299 100644
--- a/conf/app.src
+++ b/conf/app.src
@@ -1,7 +1,7 @@
 SOURCE_URL=https://github.com/movim/movim/archive/refs/tags/v0.20.zip
 SOURCE_SUM=53bd3c7060455e353fc44b5996f4e5ae9b2181dc0ef44243a3edf87e0fbfdec2
 SOURCE_SUM_PRG=sha256sum
-SOURCE_FORMAT=tar.gz
+SOURCE_FORMAT=zip
 SOURCE_IN_SUBDIR=true
 SOURCE_FILENAME=
 SOURCE_EXTRACT=true

From 3367881b2df621b44eab025829382923ae288166 Mon Sep 17 00:00:00 2001
From: jarod5001 <68397534+jarod5001@users.noreply.github.com>
Date: Wed, 4 May 2022 14:27:17 +0200
Subject: [PATCH 4/7] php8.0/composer2.3.5

---
 scripts/_common.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/_common.sh b/scripts/_common.sh
index fe3cb86..42b2dcd 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -4,9 +4,9 @@
 # COMMON VARIABLES
 #=================================================
 
-YNH_PHP_VERSION="7.3"
+YNH_PHP_VERSION="8.0"
 
-YNH_COMPOSER_VERSION="2.2.5"
+YNH_COMPOSER_VERSION="2.3.5"
 
 pkg_dependencies="postgresql postgresql-contrib apt-transport-https php${YNH_PHP_VERSION}-curl php${YNH_PHP_VERSION}-mbstring php${YNH_PHP_VERSION}-imagick php${YNH_PHP_VERSION}-gd php${YNH_PHP_VERSION}-pgsql php${YNH_PHP_VERSION}-xml"
 

From 998ef27260cc46cb0927fe1f03eee259e9711d69 Mon Sep 17 00:00:00 2001
From: jarod5001 <68397534+jarod5001@users.noreply.github.com>
Date: Wed, 4 May 2022 14:40:39 +0200
Subject: [PATCH 5/7] Update install

---
 scripts/install | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/scripts/install b/scripts/install
index 12d4b5f..d6df052 100644
--- a/scripts/install
+++ b/scripts/install
@@ -29,6 +29,7 @@ admin=$YNH_APP_ARG_ADMIN
 is_public=$YNH_APP_ARG_IS_PUBLIC
 password=$YNH_APP_ARG_PASSWORD
 timezone=$(cat /etc/timezone)
+phpversion=$YNH_PHP_VERSION
 
 app=$YNH_APP_INSTANCE_NAME
 
@@ -125,7 +126,7 @@ ynh_script_progression --message="Configuring PHP-FPM..."
 
 # Create a dedicated PHP-FPM config
 ynh_add_fpm_config
-phpversion=$(ynh_app_setting_get --app=$app --key=phpversion)
+# phpversion=$(ynh_app_setting_get --app=$app --key=phpversion)
 
 #=================================================
 # SPECIFIC SETUP

From de79c30e5da45675760f8ceb8afe0c86978f4663 Mon Sep 17 00:00:00 2001
From: jarod5001 <68397534+jarod5001@users.noreply.github.com>
Date: Wed, 4 May 2022 14:34:02 +0100
Subject: [PATCH 6/7] Update install

---
 scripts/install | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/scripts/install b/scripts/install
index d6df052..be77c6b 100644
--- a/scripts/install
+++ b/scripts/install
@@ -52,6 +52,7 @@ ynh_script_progression --message="Storing installation settings..."
 ynh_app_setting_set --app=$app --key=domain --value=$domain
 ynh_app_setting_set --app=$app --key=path --value=$path_url
 ynh_app_setting_set --app=$app --key=admin --value=$admin
+ynh_app_setting_set --app=$app --key=phpversion --value=$phpversion
 
 #=================================================
 # STANDARD MODIFICATIONS
@@ -125,7 +126,7 @@ ynh_add_nginx_config
 ynh_script_progression --message="Configuring PHP-FPM..."
 
 # Create a dedicated PHP-FPM config
-ynh_add_fpm_config
+ynh_add_fpm_config php$phpversion 
 # phpversion=$(ynh_app_setting_get --app=$app --key=phpversion)
 
 #=================================================

From 4f477a36c8c8f53f3e105285787191928c6807ab Mon Sep 17 00:00:00 2001
From: jarod5001 <68397534+jarod5001@users.noreply.github.com>
Date: Wed, 4 May 2022 14:45:32 +0100
Subject: [PATCH 7/7] Update install

---
 scripts/install | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/install b/scripts/install
index be77c6b..cb181e2 100644
--- a/scripts/install
+++ b/scripts/install
@@ -126,7 +126,7 @@ ynh_add_nginx_config
 ynh_script_progression --message="Configuring PHP-FPM..."
 
 # Create a dedicated PHP-FPM config
-ynh_add_fpm_config php$phpversion 
+ynh_add_fpm_config 
 # phpversion=$(ynh_app_setting_get --app=$app --key=phpversion)
 
 #=================================================