From 6dae6c13909ba8d59a97eca90f21e68edf2f50d0 Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Mon, 22 Feb 2021 23:27:16 +0100 Subject: [PATCH] Testing (#30) * Upgrade to 4.2.0 (#32) --- README.md | 4 ++-- README_fr.md | 4 ++-- conf/app.src | 4 ++-- manifest.json | 4 ++-- scripts/install | 4 ++-- scripts/restore | 2 +- scripts/upgrade | 12 +++++++++--- 7 files changed, 20 insertions(+), 14 deletions(-) diff --git a/README.md b/README.md index c0b4250..d16e39d 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # Matomo for YunoHost [![Integration level](https://dash.yunohost.org/integration/matomo.svg)](https://dash.yunohost.org/appci/app/matomo) ![](https://ci-apps.yunohost.org/ci/badges/matomo.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/matomo.maintain.svg) -[![Install Matomo with YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=matomo) +[![Install Matomo with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=matomo) *[Lire ce readme en français.](./README_fr.md)* @@ -11,7 +11,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in ## Overview Matomo is the leading Free/Libre open analytics platform. It is a full-featured PHP MySQL software program that you download and install on your own webserver. At the end of the five-minute installation process, you will be given a JavaScript code. Simply copy and paste this tag on websites you wish to track and access your analytics reports in real-time. -**Shipped version:** 4.0.5 +**Shipped version:** 4.2.0 ## Screenshots diff --git a/README_fr.md b/README_fr.md index c8c5f56..8192196 100644 --- a/README_fr.md +++ b/README_fr.md @@ -1,7 +1,7 @@ # Matomo pour YunoHost [![Niveau d'intégration](https://dash.yunohost.org/integration/matomo.svg)](https://dash.yunohost.org/appci/app/matomo) ![](https://ci-apps.yunohost.org/ci/badges/matomo.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/matomo.maintain.svg) -[![Installer Matomo avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=matomo) +[![Installer Matomo avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=matomo) *[Read this readme in english.](./README.md)* @@ -11,7 +11,7 @@ Si vous n'avez pas YunoHost, consultez [le guide](https://yunohost.org/#/install ## Vue d'ensemble Matomo est une plateforme d'analyse open source de mesure de statistiques Web. Il s'agit d'un logiciel PHP MySQL complet que vous téléchargez et installez sur votre propre serveur Web. À la fin du processus d'installation de cinq minutes, vous recevrez un code JavaScript. Copiez et collez simplement cette balise sur les sites Web que vous souhaitez suivre et accédez à vos rapports d'analyse en temps réel. -**Version incluse :** 4.0.5 +**Version incluse :** 4.2.0 ## Captures d'écran diff --git a/conf/app.src b/conf/app.src index 2f64345..2d9d7f6 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/matomo-org/matomo/archive/4.0.5.tar.gz -SOURCE_SUM=b201dbcf0ce87433a6509cb83c7e565fed2da9a88f192ab222367e74ee28d55a +SOURCE_URL=https://github.com/matomo-org/matomo/archive/4.2.0.tar.gz +SOURCE_SUM=6b452bc2c1f7c4eb0427ae92467deea120f7b5aa51f43b741b5cdf9f934c3e4d SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/manifest.json b/manifest.json index 7f5a27d..f48ad2c 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Open source analytics platform for measuring Web statistics", "fr": "Plateforme d'analyse open source de mesure de statistiques Web" }, - "version": "4.0.5~ynh2", + "version": "4.2.0~ynh1", "url": "https://matomo.org", "license": "GPL-3.0-or-later", "maintainer": { @@ -19,7 +19,7 @@ "multi_instance": true, "services": [ "nginx", - "php7.0-fpm", + "php7.3-fpm", "mysql" ], "arguments": { diff --git a/scripts/install b/scripts/install index 9e41513..e9ecbee 100755 --- a/scripts/install +++ b/scripts/install @@ -130,12 +130,12 @@ chown -R $app: $final_path #================================================= # SETUP SSOWAT #================================================= -ynh_script_progression --message="Configuring SSOwat..." +ynh_script_progression --message="Configuring permissions..." # Make app public if necessary or protect it if [ $is_public -eq 1 ] then - ynh_permission_update --permission "main" --add "visitors" + ynh_permission_update --permission="main" --add="visitors" fi #================================================= diff --git a/scripts/restore b/scripts/restore index 4a51b1d..5b97f86 100755 --- a/scripts/restore +++ b/scripts/restore @@ -71,7 +71,7 @@ ynh_system_user_create --username=$app ynh_script_progression --message="Restoring user rights..." # Restore permissions on app files -chown -R $app: $final_path +chown -R $app:$app $final_path #================================================= # RESTORE THE PHP-FPM CONFIGURATION diff --git a/scripts/upgrade b/scripts/upgrade index bddff85..b91629c 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -57,6 +57,13 @@ if [ -z "$final_path" ]; then ynh_app_setting_set --app=$app --key=final_path --value=$final_path fi +# Cleaning legacy permissions +if ynh_legacy_permissions_exists; then + ynh_legacy_permissions_delete_all + + ynh_app_setting_delete --app=$app --key=is_public +fi + #================================================= # BACKUP BEFORE UPGRADE THEN ACTIVE TRAP #================================================= @@ -143,9 +150,7 @@ ynh_script_progression --message="Installating composer and dependencies..." ynh_install_composer --phpversion="$phpversion" --workdir="$final_path" if [[ -f "$final_path/config/config.ini.php" ]]; then - pushd "$final_path" - ynh_exec_as $app ./console core:update - popd + php$phpversion $final_path/console core:update fi #================================================= @@ -154,6 +159,7 @@ fi if [ ! "$(ls -A "$final_path/plugins/Morpheus/icons")" ] then + ynh_script_progression --message="Installating Morpheus icons..." ynh_setup_source --dest_dir="$final_path/plugins/Morpheus/icons" --source_id="icons" chmod -R 755 "$final_path/plugins/Morpheus" fi