From 580d3ab1f5bd170b70030ff8c76d7b954861d74c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Wed, 9 Dec 2020 10:32:09 +0100 Subject: [PATCH] Upgrade to v.4.0.5 (#21) * Upgrade to 4.0.5 --- README.md | 16 +++++--------- README_fr.md | 58 +++++++++++++++++++++++++++++++++++++++++++++++++ check_process | 3 --- conf/app.src | 4 ++-- manifest.json | 2 +- scripts/install | 7 +++--- scripts/upgrade | 18 +++------------ 7 files changed, 73 insertions(+), 35 deletions(-) create mode 100644 README_fr.md diff --git a/README.md b/README.md index 9402d4c..c0b4250 100644 --- a/README.md +++ b/README.md @@ -3,21 +3,15 @@ [![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) +*[Lire ce readme en français.](./README_fr.md)* + > *This package allows you to install Matomo 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.* ## Overview -Matomo is the only analytics platform that gives you full control over your data and more: +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. -- Free open-source software -- 100% data ownership -- User privacy protection -- User-centric insights -- Customisable and extensible -- Easy to use -- No data limits - -**Shipped version:** 4.0.1 +**Shipped version:** 4.0.5 ## Screenshots @@ -36,7 +30,7 @@ Matomo is the only analytics platform that gives you full control over your data ## Documentation * Official documentation: https://matomo.org/docs - * YunoHost documentation: If specific documentation is needed, feel free to contribute. + * YunoHost documentation: https://yunohost.org/#/app_matomo #### Supported architectures diff --git a/README_fr.md b/README_fr.md new file mode 100644 index 0000000..c8c5f56 --- /dev/null +++ b/README_fr.md @@ -0,0 +1,58 @@ +# 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) + +*[Read this readme in english.](./README.md)* + +> *Ce package vous permet d'installer Matomo rapidement et simplement sur un serveur YunoHost. +Si vous n'avez pas YunoHost, consultez [le guide](https://yunohost.org/#/install) pour apprendre comment l'installer.* + +## 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 + +## Captures d'écran + +![](https://img.matomo.org/spai/w_660+q_lossless+ret_img+to_webp/https://static.matomo.org/wp-content/uploads/2019/03/matomo-analytics-dashboard.png) + +## Démo + +* [Démo officielle](https://demo.matomo.org) + +## Configuration + +1. Une fois l'installation terminée, l'application devra terminer le processus d'enregistrement en **visitant le domaine** sur lequel Matomo est installé. +1. Les informations d'identification de la base de données MySQL seront envoyées à **l'email admin**. Remplissez ces détails lors du processus d'inscription. +1. Le support LDAP n'est pas encore implémenté pour cette l'application. + +## Documentation + + * Documentation officielle : https://matomo.org/docs + * Documentation YunoHost : https://yunohost.org/#/app_matomo_fr + +#### Architectures supportées + +* x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/matomo%20%28Apps%29.svg)](https://ci-apps.yunohost.org/ci/apps/matomo/) +* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/matomo%20%28Apps%29.svg)](https://ci-apps-arm.yunohost.org/ci/apps/matomo/) + +## Liens + + * Signaler un bug : https://github.com/YunoHost-Apps/matomo_ynh/issues + * Site de l'application : https://matomo.org/ + * Dépôt de l'application principale : https://github.com/matomo-org/matomo + * Site web YunoHost : https://yunohost.org/ + +--- + +## Informations pour les développeurs + +Merci de faire vos pull request sur la [branche testing](https://github.com/YunoHost-Apps/matomo_ynh/tree/testing). + +Pour essayer la branche testing, procédez comme suit. +``` +sudo yunohost app install https://github.com/YunoHost-Apps/matomo_ynh/tree/testing --debug +ou +sudo yunohost app upgrade matomo -u https://github.com/YunoHost-Apps/matomo_ynh/tree/testing --debug +``` diff --git a/check_process b/check_process index 5fa2ce3..487c4da 100644 --- a/check_process +++ b/check_process @@ -21,9 +21,6 @@ multi_instance=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=yes diff --git a/conf/app.src b/conf/app.src index ab5a194..2f64345 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/matomo-org/matomo/archive/4.0.1.tar.gz -SOURCE_SUM=ef087588e7e02f8f10b00721a55c4ab4679c604ce299a563502079abc760bc22 +SOURCE_URL=https://github.com/matomo-org/matomo/archive/4.0.5.tar.gz +SOURCE_SUM=b201dbcf0ce87433a6509cb83c7e565fed2da9a88f192ab222367e74ee28d55a SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/manifest.json b/manifest.json index 32fea1b..35712cc 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.1~ynh1", + "version": "4.0.5~ynh1", "url": "https://matomo.org", "license": "GPL-3.0-or-later", "maintainer": { diff --git a/scripts/install b/scripts/install index 9b6a67b..6f18a0c 100755 --- a/scripts/install +++ b/scripts/install @@ -149,11 +149,12 @@ chown -R $app: $final_path #================================================= ynh_script_progression --message="Configuring SSOwat..." -# Make app public if necessary +# Make app public if necessary or protect it 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="/" + # Everyone can access the app. + # The "main" permission is automatically created before the install script. + ynh_permission_update --permission "main" --add "visitors" fi #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index f929638..6f892f9 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -124,9 +124,9 @@ ynh_install_composer --phpversion="$phpversion" --workdir="$final_path" ynh_script_progression --message="Setuping a cron..." ynh_replace_string --match_string="YNH_WWW_PATH" --replace_string="$final_path" --target_file="../conf/cron" -ynh_replace_string --match_string="__USER__" --replace_string="$app" --target_file="../conf/cron" -ynh_replace_string --match_string="__DOMAIN__" --replace_string="$domain" --target_file="../conf/cron" -ynh_replace_string --match_string="__PATH__" --replace_string="$path_url" --target_file="../conf/cron" +ynh_replace_string --match_string="__USER__" --replace_string="$app" --target_file="../conf/cron" +ynh_replace_string --match_string="__DOMAIN__" --replace_string="$domain" --target_file="../conf/cron" +ynh_replace_string --match_string="__PATH__" --replace_string="$path_url" --target_file="../conf/cron" cp -f ../conf/cron /etc/cron.d/$app #================================================= @@ -139,18 +139,6 @@ ynh_script_progression --message="Securing files and directories..." # Set permissions on app files chown -R $app: $final_path -#================================================= -# 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 #=================================================