From 177c557b0e9a922ebbd073d0eec7a86fd0e6f669 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Wed, 17 Aug 2022 19:51:03 +0200 Subject: [PATCH] Testing (#83) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 4.11.0 * Auto-update README * Upgrade to php8 (#82) * Auto-update README * [autopatch] Add Common Platform Enumeration id to `manifest.json` (#81) * Testing (#80) * 4.11.0 * Auto-update README Co-authored-by: yunohost-bot * [autopatch] Add Common Platform Enumeration id to `manifest.json` Co-authored-by: yalh76 Co-authored-by: Éric Gaspar <46165813+ericgaspar@users.noreply.github.com> Co-authored-by: Yunohost-Bot <> * Auto-update README * Auto-update README * Update manifest.json * Auto-update README * fix upgrade : Missing phpversion var definition, later used around line 117 * Update upgrade Co-authored-by: yunohost-bot Co-authored-by: YunoHost Bot Co-authored-by: yalh76 Co-authored-by: Alexandre Aubin --- README.md | 3 ++- README_fr.md | 3 ++- manifest.json | 11 ++++++----- scripts/_common.sh | 4 +++- scripts/upgrade | 3 ++- 5 files changed, 15 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 630666f..d230c69 100644 --- a/README.md +++ b/README.md @@ -22,7 +22,8 @@ Matomo is a full-featured PHP MySQL software program that you download and insta Matomo aims to be a Free software alternative to Google Analytics and is already used on more than 1,400,000 websites. Privacy is built-in! -**Shipped version:** 4.11.0~ynh2 +**Shipped version:** 4.11.0~ynh3 + **Demo:** https://demo.matomo.org diff --git a/README_fr.md b/README_fr.md index c5a3c52..4fa6d7c 100644 --- a/README_fr.md +++ b/README_fr.md @@ -22,7 +22,8 @@ Matomo is a full-featured PHP MySQL software program that you download and insta Matomo aims to be a Free software alternative to Google Analytics and is already used on more than 1,400,000 websites. Privacy is built-in! -**Version incluse :** 4.11.0~ynh2 +**Version incluse :** 4.11.0~ynh3 + **Démo :** https://demo.matomo.org diff --git a/manifest.json b/manifest.json index bbaa8a6..b111482 100644 --- a/manifest.json +++ b/manifest.json @@ -6,14 +6,15 @@ "en": "Open source analytics platform for measuring Web statistics", "fr": "Plateforme d'analyse open source de mesure de statistiques Web" }, - "version": "4.11.0~ynh2", + "version": "4.11.0~ynh3", "url": "https://matomo.org", "upstream": { "license": "GPL-3.0-or-later", "website": "https://matomo.org", "demo": "https://demo.matomo.org", "admindoc": "https://matomo.org/docs", - "code": "https://github.com/matomo-org/matomo" + "code": "https://github.com/matomo-org/matomo", + "cpe": "cpe:2.3:a:matomo:matomo" }, "license": "GPL-3.0-or-later", "maintainer": { @@ -21,12 +22,12 @@ "email": "anmol@datamol.org" }, "requirements": { - "yunohost": ">= 4.3.0" + "yunohost": ">= 11.0.9" }, "multi_instance": true, "services": [ "nginx", - "php7.3-fpm", + "php8.0-fpm", "mysql" ], "arguments": { @@ -56,4 +57,4 @@ } ] } -} +} \ No newline at end of file diff --git a/scripts/_common.sh b/scripts/_common.sh index 3dfaa50..a60a9f5 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -4,8 +4,10 @@ # COMMON VARIABLES #================================================= +YNH_PHP_VERSION=8.0 + # dependencies used by the app -pkg_dependencies="php$YNH_DEFAULT_PHP_VERSION-curl php$YNH_DEFAULT_PHP_VERSION-gd php$YNH_DEFAULT_PHP_VERSION-cli php$YNH_DEFAULT_PHP_VERSION-mysql php$YNH_DEFAULT_PHP_VERSION-xml php$YNH_DEFAULT_PHP_VERSION-mbstring" +pkg_dependencies="php$YNH_PHP_VERSION-curl php$YNH_PHP_VERSION-gd php$YNH_PHP_VERSION-cli php$YNH_PHP_VERSION-mysql php$YNH_PHP_VERSION-xml php$YNH_PHP_VERSION-mbstring" #================================================= # PERSONAL HELPERS diff --git a/scripts/upgrade b/scripts/upgrade index 89fa25c..13b6e53 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -23,6 +23,7 @@ final_path=$(ynh_app_setting_get --app=$app --key=final_path) db_name=$(ynh_app_setting_get --app=$app --key=db_name) fpm_footprint=$(ynh_app_setting_get --app=$app --key=fpm_footprint) fpm_usage=$(ynh_app_setting_get --app=$app --key=fpm_usage) +phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) email=$(ynh_user_get_info --username=$admin --key=mail) @@ -111,7 +112,7 @@ then ynh_setup_source --dest_dir="$final_path" else # Download, check integrity, uncompress and patch the source from app.src - ynh_setup_source --dest_dir="$final_path" --keep="$final_path/config/config.ini.php" + ynh_setup_source --dest_dir="$final_path" --keep="config/config.ini.php" chown -R $app:www-data "$final_path" ynh_exec_as $app php${phpversion} $final_path/console core:update -n