From f3432f2d96675f826031770e49870af78d71bba3 Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Mon, 25 Jan 2021 21:46:00 +0100
Subject: [PATCH] Small fixes

---
 README.md                | 2 +-
 check_process            | 8 +++-----
 manifest.json            | 4 ++--
 pull_request_template.md | 8 ++++----
 scripts/upgrade          | 3 ++-
 5 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/README.md b/README.md
index d46b2cb..19c460d 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 # Baïkal for YunoHost
 
 [![Integration level](https://dash.yunohost.org/integration/baikal.svg)](https://dash.yunohost.org/appci/app/baikal) ![](https://ci-apps.yunohost.org/ci/badges/baikal.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/baikal.maintain.svg)  
-[![Install Baïkal with YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=baikal)
+[![Install Baïkal with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=baikal)
 
 > *This package allow you to install Baïkal quickly and simply on a YunoHost server.  
 If you don't have YunoHost, please see [here](https://yunohost.org/#/install) to know how to install and enjoy it.*
diff --git a/check_process b/check_process
index ac1a401..339a040 100644
--- a/check_process
+++ b/check_process
@@ -11,18 +11,16 @@
 		setup_private=0
 		setup_public=0
 		upgrade=1
-		upgrade=1	from_commit=9331c8fae0a58639e824a1a77f4a5cbb46f91ac9
+		upgrade=1	from_commit=7960d347424cb1cb931c91f2628dd829288184e1
 		backup_restore=1
 		multi_instance=0
 		incorrect_path=1
 		port_already_use=0
 		change_url=1
-;;; Levels
-	Level 5=auto
 ;;; Options
 Email=
 Notification=none
 ;;; Upgrade options
-	; commit=9331c8fae0a58639e824a1a77f4a5cbb46f91ac9
-		name=Merge pull request #44 from YunoHost-Apps/0.6.0 
+	; commit=7960d347424cb1cb931c91f2628dd829288184e1
+		name=bump baikal to 0.5.3
 		manifest_arg=domain=DOMAIN&path=PATH&password=mysecret&
diff --git a/manifest.json b/manifest.json
index d7c2308..c7a87db 100644
--- a/manifest.json
+++ b/manifest.json
@@ -6,7 +6,7 @@
         "en": "Lightweight CalDAV and CardDAV server",
         "fr": "Serveur CalDAV et CardDAV léger"
     },
-    "version": "0.7.1~ynh1",
+    "version": "0.7.1~ynh2",
     "url": "http://baikal-server.com/",
     "license": "GPL-3.0",
     "maintainer": {
@@ -19,7 +19,7 @@
     "multi_instance": false,
     "services": [
         "nginx",
-        "php7.0-fpm",
+        "php7.3-fpm",
         "mysql"
     ],
     "arguments": {
diff --git a/pull_request_template.md b/pull_request_template.md
index eb2a30e..f501dd4 100644
--- a/pull_request_template.md
+++ b/pull_request_template.md
@@ -18,7 +18,7 @@
 - [ ] **Code review** : 
 - [ ] **Approval (LGTM)** : 
 - [ ] **Approval (LGTM)** : 
-- **CI succeeded** : 
-[![Build Status](https://ci-apps-hq.yunohost.org/jenkins/job/baikal_ynh%20PR-NUM-/badge/icon)](https://ci-apps-hq.yunohost.org/jenkins/job/baikal_ynh%20PR-NUM-/)  
-*Please replace '-NUM-' in this link by the PR number.*  
-When the PR is marked as ready to merge, you have to wait for 3 days before really merging it.
+
+## Package_check results
+---
+* An automatic package_check will be launch at https://ci-apps-dev.yunohost.org/, when you add a specific comment to your Pull Request: "!testme", "!gogogadgetoci" or "By the power of systemd, I invoke The Great App CI to test this Pull Request!"*
diff --git a/scripts/upgrade b/scripts/upgrade
index d463884..72aa84b 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -20,6 +20,7 @@ domain=$(ynh_app_setting_get --app=$app --key=domain)
 path_url=$(ynh_app_setting_get --app=$app --key=path)
 final_path=$(ynh_app_setting_get --app=$app --key=final_path)
 db_name=$(ynh_app_setting_get --app=$app --key=db_name)
+phpversion=$(ynh_app_setting_get --app=$app --key=phpversion)
 
 #=================================================
 # CHECK VERSION
@@ -91,7 +92,6 @@ ynh_script_progression --message="Upgrading NGINX web server configuration..."
 
 # Create a dedicated NGINX config
 ynh_add_nginx_config
-phpversion=$(ynh_app_setting_get --app=$app --key=phpversion)
 
 #=================================================
 # UPGRADE DEPENDENCIES
@@ -190,6 +190,7 @@ ynh_script_progression --message="Configuring SSOwat..." --weight=2
 
 # Upgrade from the legacy permissions system
 protected_uris=$(ynh_app_setting_get --app="$app" --key=protected_uris)
+
 if [ -n "${protected_uris}" ]; then
     ynh_app_setting_delete --app="$app" --key=protected_uris