Revert "Fix"

This reverts commit 5f37ec4674.

README.md

@@ -1,7 +1,8 @@
 # Monica for YunoHost
 
 [![Integration level](https://dash.yunohost.org/integration/monica.svg)](https://dash.yunohost.org/appci/app/monica) ![](https://ci-apps.yunohost.org/ci/badges/monica.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/monica.maintain.svg)
-[![Install Monica with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=monica)
+
+[![Install Monica with YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=monica)
 
 > *This package allows you to install Monica quickly and simply on a YunoHost server.
 If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/install) to learn how to install it.*

check_process

@@ -30,8 +30,13 @@
 		upgrade=1	from_commit=d03eaae18c5b99f7933ae18378d5567fc46389f5
 		backup_restore=1
 		multi_instance=1
+		# This test is no longer necessary since the version 2.7 (PR: https://github.com/YunoHost/yunohost/pull/304), you can still do it if your app could be installed with this version.
+		# incorrect_path=1
 		port_already_use=0
 		change_url=0
+;;; Levels
+	# If the level 5 (Package linter) is forced to 1. Please add justifications here.
+	Level 5=auto
 ;;; Options
 Email=anmol@datamol.org
 Notification=change

manifest.json

@@ -3,8 +3,7 @@
     "id": "monica",
     "packaging_format": 1,
     "description": {
-        "en": "Personal Relationship Manager - a new kind of CRM to organize interactions with your friends and family.",
-        "fr": "Nouveau type de CRM pour organiser les interactions avec vos amis et votre famille."
+        "en": " Personal Relationship Manager - a new kind of CRM to organize interactions with your friends and family."
     },
     "version": "2.19.1~ynh1",
     "url": "https://monicahq.com",
@@ -20,7 +19,7 @@
     "multi_instance": true,
     "services": [
         "nginx",
-        "php7.3-fpm",
+        "php7.0-fpm",
         "mysql"
     ],
     "arguments": {

pull_request_template.md

@@ -13,4 +13,6 @@
 
 ## 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!"*
+*If you have access to [App Continuous Integration for packagers](https://yunohost.org/#/packaging_apps_ci) you can provide a link to the package_check results like below, replacing '-NUM-' in this link by the PR number and USERNAME by your username on the ci-apps-dev. Or you provide a screenshot or a pastebin of the results*
+
+[![Build Status](https://ci-apps-dev.yunohost.org/jenkins/job/monica_ynh%20PR-NUM-%20(USERNAME)/badge/icon)](https://ci-apps-dev.yunohost.org/jenkins/job/monica_ynh%20PR-NUM-%20(USERNAME)/)  

scripts/_common.sh

@@ -7,7 +7,7 @@
 # dependencies used by the app
 pkg_dependencies="redis-server"
 
-YNH_PHP_VERSION="7.4"
+YNH_PHP_VERSION="7.3"
 
 extra_php_dependencies="php${YNH_PHP_VERSION}-imagick php${YNH_PHP_VERSION}-cli php${YNH_PHP_VERSION}-json php${YNH_PHP_VERSION}-opcache php${YNH_PHP_VERSION}-mysql php${YNH_PHP_VERSION}-mbstring php${YNH_PHP_VERSION}-zip php${YNH_PHP_VERSION}-bcmath php${YNH_PHP_VERSION}-intl php${YNH_PHP_VERSION}-xml php${YNH_PHP_VERSION}-curl php${YNH_PHP_VERSION}-gd php${YNH_PHP_VERSION}-gmp php${YNH_PHP_VERSION}-redis"
 

scripts/install

@@ -221,12 +221,13 @@ chmod -R 775 "$final_path/storage"
 #=================================================
 # SETUP SSOWAT
 #=================================================
-ynh_script_progression --message="Configuring permissions..."
+ynh_script_progression --message="Configuring SSOwat..."
 
 # Make app public if necessary
 if [ $is_public -eq 1 ]
 then
-	ynh_permission_update --permission="main" --add="visitors"
+	# unprotected_uris allows SSO credentials to be passed anyway.
+	ynh_app_setting_set --app=$app --key=unprotected_uris --value="/"
 fi
 
 #=================================================

scripts/upgrade

@@ -31,7 +31,6 @@ email=$(ynh_user_get_info --username=$admin --key=mail)
 dav_support=$(ynh_app_setting_get --app=$app --key=dav_support)
 signup=$(ynh_app_setting_get --app=$app --key=signup)
 two_factor=$(ynh_app_setting_get --app=$app --key=two_factor)
-phpversion=$(ynh_app_setting_get --app=$app --key=phpversion)
 
 #=================================================
 # CHECK VERSION
@@ -88,6 +87,13 @@ 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
 #=================================================
@@ -132,6 +138,7 @@ ynh_script_progression --message="Upgrading PHP-FPM configuration..."
 
 # Create a dedicated PHP-FPM config
 ynh_add_fpm_config --usage=low --footprint=low --package="$extra_php_dependencies"
+phpversion=$(ynh_app_setting_get --app=$app --key=phpversion)
 
 #=================================================
 # SPECIFIC UPGRADE
@@ -255,6 +262,18 @@ ynh_script_progression --message="Securing files and directories..."
 chown -R $app: $final_path
 chmod -R 775 "$final_path/storage"
 
+#=================================================
+# SETUP SSOWAT
+#=================================================
+ynh_script_progression --message="Upgrading SSOwat configuration..."
+
+# Make app public if necessary
+if [ $is_public -eq 1 ]
+then
+	# unprotected_uris allows SSO credentials to be passed anyway
+	ynh_app_setting_set --app=$app --key=unprotected_uris --value="/"
+fi
+
 #=================================================
 # RELOAD NGINX
 #=================================================

scripts/ynh_composer__2

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-readonly YNH_DEFAULT_COMPOSER_VERSION=2.0.8
+readonly YNH_DEFAULT_COMPOSER_VERSION=1.10.17
 # Declare the actual composer version to use.
 # A packager willing to use another version of composer can override the variable into its _common.sh.
 YNH_COMPOSER_VERSION=${YNH_COMPOSER_VERSION:-$YNH_DEFAULT_COMPOSER_VERSION}