From fab5a89cd0209ef4b5391cd127152a78701bdf1d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Fri, 19 Jun 2020 22:18:51 +0200 Subject: [PATCH 1/4] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index eafffda..3b2f08e 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Matomo app for Yunohost +# 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) From 2aa314b1233b28f6b55c3be076ed299a9b98a3ed Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sun, 13 Sep 2020 17:38:08 +0200 Subject: [PATCH 2/4] Upgrade to 3.14.1 --- README.md | 12 +++++------- conf/app.src | 4 ++-- issue_template.md | 8 ++++---- manifest.json | 2 +- 4 files changed, 12 insertions(+), 14 deletions(-) diff --git a/README.md b/README.md index 3b2f08e..dfc8c73 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,5 @@ # 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) @@ -18,11 +17,11 @@ Matomo is the only analytics platform that gives you full control over your data - Easy to use - No data limits -**Shipped version:** 3.10.0 +**Shipped version:** 3.14.1 ## Screenshots -![](https://static.matomo.org/wp-content/uploads/2019/01/matomo-interface-new.webp) +![](https://img.matomo.org/spai/w_720+q_lossless+ret_img+to_webp/https://static.matomo.org/wp-content/uploads/2020/06/website-graphics-2020-v5-1.png) ## Demo @@ -31,8 +30,8 @@ Matomo is the only analytics platform that gives you full control over your data ## Configuration 1. The app will require to complete the registration process after the instllation is complete by **visiting the domain** on which Matomo is installed. -1. The mysql database credentials will be sent to the **admin mail**. Fill these details while doing the registration process. -1. No Ldap support yet for the app. +1. The MySQL database credentials will be sent to the **admin mail**. Fill these details while doing the registration process. +1. No LDAP support yet for the app. ## Documentation @@ -52,8 +51,7 @@ Matomo is the only analytics platform that gives you full control over your data --- -Developer info ----------------- +## Developer info Please send your pull request to the [testing branch](https://github.com/YunoHost-Apps/matomo_ynh/tree/testing). diff --git a/conf/app.src b/conf/app.src index 3dcab89..9e0b24a 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/matomo-org/matomo/archive/3.10.0.tar.gz -SOURCE_SUM=84ef1f5870ae19c12f19fe4a8aae2442bb6d72cfcd9607b0b0229fbae5e78fc6 +SOURCE_URL=https://github.com/matomo-org/matomo/archive/3.14.1.tar.gz +SOURCE_SUM=73d7fed246860494c6f7242cee3fb829abfff36531f5ae5e39f862d68fe3c404 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/issue_template.md b/issue_template.md index 1bf2844..f6b6b8b 100644 --- a/issue_template.md +++ b/issue_template.md @@ -7,8 +7,8 @@ about: Create a report to help us debug, it would be nice to fill the template a **How to post a meaningful bug report** 1. *Read this whole template first.* 2. *Determine if you are on the right place:* - - *If you were performing an action on the app from the webadmin or the CLI (install, update, backup, restore, change url...), you are on the right place!* - - *Otherwise, the issue may be due to matomo itself. Refer to its documentation or repository for help.* + - *If you were performing an action on the app from the webadmin or the CLI (install, update, backup, restore, change_url...), you are on the right place!* + - *Otherwise, the issue may be due toMatomo itself. Refer to its documentation or repository for help.* - *If you have a doubt, post here, we will figure it out together.* 3. *Delete the italic comments as you write over them below, and remove this guide.* --- @@ -34,8 +34,8 @@ about: Create a report to help us debug, it would be nice to fill the template a - *If you used the webadmin, please perform the equivalent command from the CLI first.* - *If the error occurs in your browser, explain what you did:* 1. *Go to '...'* - 2. *Click on '....'* - 3. *Scroll down to '....'* + 2. *Click on '...'* + 3. *Scroll down to '...'* 4. *See error* **Expected behavior** diff --git a/manifest.json b/manifest.json index 5efaeb7..f11bcfa 100644 --- a/manifest.json +++ b/manifest.json @@ -5,7 +5,7 @@ "description": { "en": "Opensource analytics platform" }, - "version": "3.10.0~ynh1", + "version": "3.14.1~ynh1", "url": "https://matomo.org", "license": "GPL-3.0-or-later", "maintainer": { From d848f06bfdb1e2718b85e78f1d3f3ba155133bb8 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sun, 13 Sep 2020 17:56:50 +0200 Subject: [PATCH 3/4] typos --- README.md | 3 ++- scripts/install | 10 +++++----- scripts/remove | 8 ++++---- scripts/restore | 4 ++-- scripts/upgrade | 8 ++++---- 5 files changed, 17 insertions(+), 16 deletions(-) diff --git a/README.md b/README.md index dfc8c73..001d7a1 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ Matomo is the only analytics platform that gives you full control over your data ## Screenshots -![](https://img.matomo.org/spai/w_720+q_lossless+ret_img+to_webp/https://static.matomo.org/wp-content/uploads/2020/06/website-graphics-2020-v5-1.png) +![](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) ## Demo @@ -36,6 +36,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. #### Supported architectures diff --git a/scripts/install b/scripts/install index 9dbd3e7..0fd3d69 100755 --- a/scripts/install +++ b/scripts/install @@ -78,9 +78,9 @@ ynh_setup_source --dest_dir="$final_path" #================================================= # NGINX CONFIGURATION #================================================= -ynh_script_progression --message="Configuring nginx web server..." +ynh_script_progression --message="Configuring NGINX web server..." -# Create a dedicated nginx config +# Create a dedicated NGINX config ynh_add_nginx_config #================================================= @@ -94,9 +94,9 @@ ynh_system_user_create --username=$app #================================================= # PHP-FPM CONFIGURATION #================================================= -ynh_script_progression --message="Configuring php-fpm..." +ynh_script_progression --message="Configuring PHP-FPM..." -# Create a dedicated php-fpm config +# 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) @@ -168,7 +168,7 @@ fi #================================================= # RELOAD NGINX #================================================= -ynh_script_progression --message="Reloading nginx web server..." +ynh_script_progression --message="Reloading NGINX web server..." ynh_systemd_action --service_name=nginx --action=reload diff --git a/scripts/remove b/scripts/remove index 4b9eb04..516968d 100755 --- a/scripts/remove +++ b/scripts/remove @@ -50,17 +50,17 @@ ynh_secure_remove --file="$final_path" #================================================= # REMOVE NGINX CONFIGURATION #================================================= -ynh_script_progression --message="Removing nginx web server configuration..." +ynh_script_progression --message="Removing NGINX web server configuration..." -# Remove the dedicated nginx config +# Remove the dedicated NGINX config ynh_remove_nginx_config #================================================= # REMOVE PHP-FPM CONFIGURATION #================================================= -ynh_script_progression --message="Removing php-fpm configuration..." +ynh_script_progression --message="Removing PHP-FPM configuration..." -# Remove the dedicated php-fpm config +# Remove the dedicated PHP-FPM config ynh_remove_fpm_config #================================================= diff --git a/scripts/restore b/scripts/restore index b7611c6..f60ff48 100755 --- a/scripts/restore +++ b/scripts/restore @@ -46,7 +46,7 @@ test ! -d $final_path \ #================================================= # RESTORE THE NGINX CONFIGURATION #================================================= -ynh_script_progression --message="Restoring the nginx configuration..." +ynh_script_progression --message="Restoring the NGINX configuration..." ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf" @@ -115,7 +115,7 @@ ynh_restore_file --origin_path="/etc/cron.d/$app" #================================================= # RELOAD NGINX AND PHP-FPM #================================================= -ynh_script_progression --message="Reloading nginx web server and php-fpm..." +ynh_script_progression --message="Reloading NGINX web server and php-fpm..." ynh_systemd_action --service_name=php$phpversion-fpm --action=reload ynh_systemd_action --service_name=nginx --action=reload diff --git a/scripts/upgrade b/scripts/upgrade index e4e1c74..f87535d 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -94,9 +94,9 @@ fi #================================================= # NGINX CONFIGURATION #================================================= -ynh_script_progression --message="Upgrading nginx web server configuration..." +ynh_script_progression --message="Upgrading NGINX web server configuration..." -# Create a dedicated nginx config +# Create a dedicated NGINX config ynh_add_nginx_config #================================================= @@ -117,7 +117,7 @@ ynh_system_user_create --username=$app #================================================= # PHP-FPM CONFIGURATION #================================================= -ynh_script_progression --message="Upgrading php-fpm configuration..." +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" @@ -168,7 +168,7 @@ fi #================================================= # RELOAD NGINX #================================================= -ynh_script_progression --message="Reloading nginx web server..." +ynh_script_progression --message="Reloading NGINX web server..." ynh_systemd_action --service_name=nginx --action=reload From 3a09c69f72b829a2180f95508d702494070aee3c Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sun, 13 Sep 2020 18:14:34 +0200 Subject: [PATCH 4/4] Add fr description --- issue_template.md | 2 +- manifest.json | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/issue_template.md b/issue_template.md index f6b6b8b..0f954a7 100644 --- a/issue_template.md +++ b/issue_template.md @@ -8,7 +8,7 @@ about: Create a report to help us debug, it would be nice to fill the template a 1. *Read this whole template first.* 2. *Determine if you are on the right place:* - *If you were performing an action on the app from the webadmin or the CLI (install, update, backup, restore, change_url...), you are on the right place!* - - *Otherwise, the issue may be due toMatomo itself. Refer to its documentation or repository for help.* + - *Otherwise, the issue may be due to Matomo itself. Refer to its documentation or repository for help.* - *If you have a doubt, post here, we will figure it out together.* 3. *Delete the italic comments as you write over them below, and remove this guide.* --- diff --git a/manifest.json b/manifest.json index f11bcfa..69534b0 100644 --- a/manifest.json +++ b/manifest.json @@ -3,7 +3,8 @@ "id": "matomo", "packaging_format": 1, "description": { - "en": "Opensource analytics platform" + "en": "Open source analytics platform for measuring Web statistics", + "fr": "Plateforme d'analyse open source de mesure de statistiques Web" }, "version": "3.14.1~ynh1", "url": "https://matomo.org",