From 87c3cce789d33783572c1105b2cea1bd284f740a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Mon, 14 Aug 2023 14:06:45 +0200 Subject: [PATCH 01/25] cleaning --- manifest.toml | 2 +- scripts/install | 1 - scripts/restore | 1 - scripts/upgrade | 3 +-- 4 files changed, 2 insertions(+), 5 deletions(-) diff --git a/manifest.toml b/manifest.toml index 787fed8..5204446 100644 --- a/manifest.toml +++ b/manifest.toml @@ -17,7 +17,7 @@ admindoc = "https://matomo.org/docs" code = "https://github.com/matomo-org/matomo" [integration] -yunohost = ">= 11.1.21" +yunohost = ">= 11.2" architectures = "all" multi_instance = true ldap = false diff --git a/scripts/install b/scripts/install index 8bc9dc3..1654fc2 100755 --- a/scripts/install +++ b/scripts/install @@ -27,7 +27,6 @@ ynh_script_progression --message="Setting up source files..." --weight=4 # Download, check integrity, uncompress and patch the source from app.src ynh_setup_source --dest_dir="$install_dir" -chmod -R o-rwx "$install_dir" chown -R $app:www-data "$install_dir" #================================================= diff --git a/scripts/restore b/scripts/restore index 71a355d..adac2db 100755 --- a/scripts/restore +++ b/scripts/restore @@ -17,7 +17,6 @@ ynh_script_progression --message="Restoring the app main directory..." --weight= ynh_restore_file --origin_path="$install_dir" -chmod -R o-rwx "$install_dir" chown -R $app:www-data "$install_dir" #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index dbc226f..5ca5dde 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -60,7 +60,6 @@ then fi fi -chmod -R o-rwx "$install_dir" chown -R $app:www-data "$install_dir" #================================================= @@ -69,7 +68,7 @@ chown -R $app:www-data "$install_dir" ynh_script_progression --message="Upgrading PHP-FPM configuration..." --weight=2 # Create a dedicated PHP-FPM config -ynh_add_fpm_config --phpversion=$phpversion --usage=$fpm_usage --footprint=$fpm_footprint +ynh_add_fpm_config --usage=$fpm_usage --footprint=$fpm_footprint # Create a dedicated NGINX config ynh_add_nginx_config From 5f43a106d19690f2aee01ee523bc2350ff9317cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Mon, 14 Aug 2023 14:08:44 +0200 Subject: [PATCH 02/25] cleaning --- doc/DESCRIPTION_fr.md | 3 +++ doc/POST_INSTALL_fr.md | 7 +++++++ manifest.toml | 6 +++--- 3 files changed, 13 insertions(+), 3 deletions(-) create mode 100644 doc/DESCRIPTION_fr.md create mode 100644 doc/POST_INSTALL_fr.md diff --git a/doc/DESCRIPTION_fr.md b/doc/DESCRIPTION_fr.md new file mode 100644 index 0000000..19bd2a6 --- /dev/null +++ b/doc/DESCRIPTION_fr.md @@ -0,0 +1,3 @@ +Matomo est la principale plateforme d'analyse ouverte Free/Libre. À 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. + +Matomo se veut une alternative logicielle gratuite à Google Analytics et est déjà utilisé sur plus de 1 400 000 sites Web. La confidentialité est intégrée ! \ No newline at end of file diff --git a/doc/POST_INSTALL_fr.md b/doc/POST_INSTALL_fr.md new file mode 100644 index 0000000..8faf1fc --- /dev/null +++ b/doc/POST_INSTALL_fr.md @@ -0,0 +1,7 @@ +Une fois l'installation terminée, l'application devra terminer le processus d'enregistrement en visitant https://__DOMAIN____PATH__. + +Détails de la base de données MySQL à saisir lors du processus d'inscription : + +- Connexion à la base de données : __DB_USER__ +- Nom de la base de données : __DB_NAME__ +- Mot de passe de la base de données : __DB_PWD__ \ No newline at end of file diff --git a/manifest.toml b/manifest.toml index 5204446..f0bcf84 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "Matomo" description.en = "Open source analytics platform for measuring Web statistics" description.fr = "Plateforme d'analyse open source de mesure de statistiques Web" -version = "4.15.0~ynh1" +version = "4.15.1~ynh1" maintainers = [] @@ -48,8 +48,8 @@ ram.runtime = "50M" [resources.sources] [resources.sources.main] - url = "https://builds.matomo.org/matomo-4.15.0.tar.gz" - sha256 = "619b2ef500e1c50f4ccee2e094ddfa0928cf8e76fe40b787483c1d11ee69978e" + url = "https://builds.matomo.org/matomo-4.15.1.tar.gz" + sha256 = "5e77e2a6b18ba8542a3e4df481c0152dd059de960c49d04f7e789c9bb5753d27" [resources.system_user] From 82f8c89da38ca4cb2528524094936cc280a9c6d7 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Mon, 14 Aug 2023 12:08:49 +0000 Subject: [PATCH 03/25] Auto-update README --- README.md | 2 +- README_fr.md | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index bc551e2..00ae537 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ Matomo is the leading Free/Libre open analytics platform. At the end of the five 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.15.0~ynh1 +**Shipped version:** 4.15.1~ynh1 **Demo:** https://demo.matomo.org diff --git a/README_fr.md b/README_fr.md index 7ba8467..b35e6c1 100644 --- a/README_fr.md +++ b/README_fr.md @@ -16,12 +16,11 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po ## Vue d’ensemble -Matomo is the leading Free/Libre open analytics platform. 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. +Matomo est la principale plateforme d'analyse ouverte Free/Libre. À 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. -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! +Matomo se veut une alternative logicielle gratuite à Google Analytics et est déjà utilisé sur plus de 1 400 000 sites Web. La confidentialité est intégrée ! - -**Version incluse :** 4.15.0~ynh1 +**Version incluse :** 4.15.1~ynh1 **Démo :** https://demo.matomo.org From 1237c5b1b9cf745fc6efda801003047f07c8c318 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Mon, 14 Aug 2023 21:38:28 +0200 Subject: [PATCH 04/25] Update nginx.conf --- conf/nginx.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/conf/nginx.conf b/conf/nginx.conf index a0d8c19..54b5309 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -7,6 +7,7 @@ location ^~ __PATH__/ { more_set_headers "Referrer-Policy: origin always"; more_set_headers "X-Content-Type-Options: nosniff"; more_set_headers "X-XSS-Protection: 1; mode=block"; + more_set_headers "Access-Control-Allow-Origin: *"; index index.php; From 3d167b35fdfce17f4fab07abf33d6eccca0e4b93 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Mon, 14 Aug 2023 21:40:23 +0200 Subject: [PATCH 05/25] Update manifest.toml --- manifest.toml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/manifest.toml b/manifest.toml index f0bcf84..3721a02 100644 --- a/manifest.toml +++ b/manifest.toml @@ -2,10 +2,10 @@ packaging_format = 2 id = "matomo" name = "Matomo" -description.en = "Open source analytics platform for measuring Web statistics" -description.fr = "Plateforme d'analyse open source de mesure de statistiques Web" +description.en = "Analytics platform for measuring Web statistics" +description.fr = "Plateforme d'analyse de mesure de statistiques Web" -version = "4.15.1~ynh1" +version = "4.15.1~ynh2" maintainers = [] @@ -35,8 +35,8 @@ ram.runtime = "50M" default = "/matomo" [install.init_main_permission] - help.en = "If enabled, Matomo will be accessible by people who do not have an account. This can be changed later via the webadmin." - help.fr = "Si cette case est cochée, Matomo sera accessible aux personnes n’ayant pas de compte. Vous pourrez changer ceci plus tard via la webadmin." + help.en = "If visitors enabled, Matomo will be accessible by people who do not have an account. This can be changed later via the webadmin." + help.fr = "Si visiteurs est cochée, Matomo sera accessible aux personnes n’ayant pas de compte. Vous pourrez changer ceci plus tard via la webadmin." type = "group" default = "visitors" From 8e5d32a24bf05efffa01f9b8565bcdc89cbb16a7 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Mon, 14 Aug 2023 19:40:28 +0000 Subject: [PATCH 06/25] Auto-update README --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 00ae537..a49ce6d 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ Matomo is the leading Free/Libre open analytics platform. At the end of the five 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.15.1~ynh1 +**Shipped version:** 4.15.1~ynh2 **Demo:** https://demo.matomo.org diff --git a/README_fr.md b/README_fr.md index b35e6c1..1cf8d66 100644 --- a/README_fr.md +++ b/README_fr.md @@ -20,7 +20,7 @@ Matomo est la principale plateforme d'analyse ouverte Free/Libre. À la fin du p Matomo se veut une alternative logicielle gratuite à Google Analytics et est déjà utilisé sur plus de 1 400 000 sites Web. La confidentialité est intégrée ! -**Version incluse :** 4.15.1~ynh1 +**Version incluse :** 4.15.1~ynh2 **Démo :** https://demo.matomo.org From c8a296557d26b200f949d3dd657335d3d9b2b911 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 12 Sep 2023 09:49:39 +0200 Subject: [PATCH 07/25] Update manifest.toml --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index 3721a02..440c928 100644 --- a/manifest.toml +++ b/manifest.toml @@ -59,7 +59,7 @@ ram.runtime = "50M" main.url = "/" [resources.apt] - packages = "mariadb-server php8.2-curl php8.2-gd php8.2-cli php8.2-mysql php8.2-xml php8.2-mbstring" + packages = "mariadb-server, php8.2-curl, php8.2-gd, php8.2-cli, php8.2-mysql, php8.2-xml, php8.2-mbstring" [resources.database] type = "mysql" From 5486550fac1f09e3a2204639f1c349cc8cfc4b55 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 2 Nov 2023 16:11:15 +0100 Subject: [PATCH 08/25] cleaning --- scripts/install | 6 +----- scripts/upgrade | 25 +------------------------ 2 files changed, 2 insertions(+), 29 deletions(-) diff --git a/scripts/install b/scripts/install index 1654fc2..12333b9 100755 --- a/scripts/install +++ b/scripts/install @@ -15,10 +15,6 @@ source /usr/share/yunohost/helpers email=$(ynh_user_get_info --username=$admin --key=mail) -fpm_footprint="low" -fpm_free_footprint=0 -fpm_usage="low" - #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE #================================================= @@ -35,7 +31,7 @@ chown -R $app:www-data "$install_dir" ynh_script_progression --message="Configuring PHP-FPM..." --weight=3 # Create a dedicated PHP-FPM config -ynh_add_fpm_config --usage=$fpm_usage --footprint=$fpm_footprint +ynh_add_fpm_config # Create a dedicated NGINX config ynh_add_nginx_config diff --git a/scripts/upgrade b/scripts/upgrade index 5ca5dde..614a519 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -15,29 +15,6 @@ source /usr/share/yunohost/helpers upgrade_type=$(ynh_check_app_version_changed) -#================================================= -# ENSURE DOWNWARD COMPATIBILITY -#================================================= -ynh_script_progression --message="Ensuring downward compatibility..." --weight=1 - -# If fpm_footprint doesn't exist, create it -if [ -z "${fpm_footprint:-}" ]; then - fpm_footprint=low - ynh_app_setting_set --app=$app --key=fpm_footprint --value=$fpm_footprint -fi - -# If fpm_free_footprint doesn't exist, create it -if [ -z "${fpm_free_footprint:-}" ]; then - fpm_free_footprint=0 - ynh_app_setting_set --app=$app --key=fpm_free_footprint --value=$fpm_free_footprint -fi - -# If fpm_usage doesn't exist, create it -if [ -z "${fpm_usage:-}" ]; then - fpm_usage=low - ynh_app_setting_set --app=$app --key=fpm_usage --value=$fpm_usage -fi - #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE #================================================= @@ -68,7 +45,7 @@ chown -R $app:www-data "$install_dir" ynh_script_progression --message="Upgrading PHP-FPM configuration..." --weight=2 # Create a dedicated PHP-FPM config -ynh_add_fpm_config --usage=$fpm_usage --footprint=$fpm_footprint +ynh_add_fpm_config # Create a dedicated NGINX config ynh_add_nginx_config From 3413dc6cfa50377ff9f56a946be699ecab6d34cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 2 Nov 2023 16:13:00 +0100 Subject: [PATCH 09/25] cleaning --- scripts/change_url | 5 +---- scripts/install | 2 +- scripts/upgrade | 2 +- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/scripts/change_url b/scripts/change_url index 5d55828..e25b156 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -23,10 +23,7 @@ ynh_change_url_nginx_config #================================================= ynh_script_progression --message="Setuping a cron..." --weight=1 -path=$new_path -domain=$new_domain - -ynh_add_config --template="../conf/cron" --destination="/etc/cron.d/$app" +ynh_add_config --template="cron" --destination="/etc/cron.d/$app" chown root: "/etc/cron.d/$app" chmod 644 "/etc/cron.d/$app" diff --git a/scripts/install b/scripts/install index 12333b9..c992b81 100755 --- a/scripts/install +++ b/scripts/install @@ -36,7 +36,7 @@ ynh_add_fpm_config # Create a dedicated NGINX config ynh_add_nginx_config -ynh_add_config --template="../conf/cron" --destination="/etc/cron.d/$app" +ynh_add_config --template="cron" --destination="/etc/cron.d/$app" chown root: "/etc/cron.d/$app" chmod 644 "/etc/cron.d/$app" diff --git a/scripts/upgrade b/scripts/upgrade index 614a519..0d57267 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -50,7 +50,7 @@ ynh_add_fpm_config # Create a dedicated NGINX config ynh_add_nginx_config -ynh_add_config --template="../conf/cron" --destination="/etc/cron.d/$app" +ynh_add_config --template="cron" --destination="/etc/cron.d/$app" chown root: "/etc/cron.d/$app" chmod 644 "/etc/cron.d/$app" From b6b4227721cd440e2072d6c7143f7b0227105d34 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 2 Nov 2023 16:13:12 +0100 Subject: [PATCH 10/25] Update manifest.toml --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index 440c928..550d5e6 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "Matomo" description.en = "Analytics platform for measuring Web statistics" description.fr = "Plateforme d'analyse de mesure de statistiques Web" -version = "4.15.1~ynh2" +version = "4.15.1~ynh3" maintainers = [] From f1aa2ca203ff19f6b81670119ea16be15b517503 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Thu, 2 Nov 2023 15:13:16 +0000 Subject: [PATCH 11/25] Auto-update README --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 296e8a4..ca513e5 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ Matomo is the leading Free/Libre open analytics platform. At the end of the five 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.15.1~ynh2 +**Shipped version:** 4.15.1~ynh3 **Demo:** https://demo.matomo.org diff --git a/README_fr.md b/README_fr.md index 998c2cc..d442afd 100644 --- a/README_fr.md +++ b/README_fr.md @@ -20,7 +20,7 @@ Matomo est la principale plateforme d'analyse ouverte Free/Libre. À la fin du p Matomo se veut une alternative logicielle gratuite à Google Analytics et est déjà utilisé sur plus de 1 400 000 sites Web. La confidentialité est intégrée ! -**Version incluse :** 4.15.1~ynh2 +**Version incluse :** 4.15.1~ynh3 **Démo :** https://demo.matomo.org From 375037514ba0b517aea056892df02006a9eacde6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 28 Nov 2023 19:35:09 +0100 Subject: [PATCH 12/25] Update manifest.toml --- manifest.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/manifest.toml b/manifest.toml index 550d5e6..7e4c479 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "Matomo" description.en = "Analytics platform for measuring Web statistics" description.fr = "Plateforme d'analyse de mesure de statistiques Web" -version = "4.15.1~ynh3" +version = "4.16.0~ynh1" maintainers = [] @@ -48,8 +48,8 @@ ram.runtime = "50M" [resources.sources] [resources.sources.main] - url = "https://builds.matomo.org/matomo-4.15.1.tar.gz" - sha256 = "5e77e2a6b18ba8542a3e4df481c0152dd059de960c49d04f7e789c9bb5753d27" + url = "https://builds.matomo.org/matomo-4.16.0.tar.gz" + sha256 = "385653e35f795935b0d97340c8688d8b15ba85234a0b72320696b990cf4f0959" [resources.system_user] From 00f0d067fae3df059281ba01b582e608d7c874fb Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Tue, 28 Nov 2023 18:35:13 +0000 Subject: [PATCH 13/25] Auto-update README --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index ca513e5..c4459f7 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ Matomo is the leading Free/Libre open analytics platform. At the end of the five 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.15.1~ynh3 +**Shipped version:** 4.16.0~ynh1 **Demo:** https://demo.matomo.org diff --git a/README_fr.md b/README_fr.md index d442afd..eaa2901 100644 --- a/README_fr.md +++ b/README_fr.md @@ -20,7 +20,7 @@ Matomo est la principale plateforme d'analyse ouverte Free/Libre. À la fin du p Matomo se veut une alternative logicielle gratuite à Google Analytics et est déjà utilisé sur plus de 1 400 000 sites Web. La confidentialité est intégrée ! -**Version incluse :** 4.15.1~ynh3 +**Version incluse :** 4.16.0~ynh1 **Démo :** https://demo.matomo.org From db1bf4e486fd1628e4d41814b6a543b390be8b57 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sat, 9 Dec 2023 22:03:19 +0100 Subject: [PATCH 14/25] Update manifest.toml --- manifest.toml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/manifest.toml b/manifest.toml index 7e4c479..f094048 100644 --- a/manifest.toml +++ b/manifest.toml @@ -20,8 +20,11 @@ code = "https://github.com/matomo-org/matomo" yunohost = ">= 11.2" architectures = "all" multi_instance = true + ldap = false + sso = false + disk = "50M" ram.build = "200M" ram.runtime = "50M" From 0c360b40ccd69ca911042dd8b84a6d7bd6e64dc8 Mon Sep 17 00:00:00 2001 From: eric_G <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 19 Dec 2023 09:12:51 +0100 Subject: [PATCH 15/25] 5.0.0 (#107) * 5.0.0 * Update manifest.toml * Auto-update README * cleaning * Update manifest.toml * cleaning * Update tests.toml --------- Co-authored-by: yunohost-bot --- README.md | 2 +- README_fr.md | 2 +- manifest.toml | 9 +++++---- scripts/change_url | 3 +++ scripts/install | 1 + scripts/restore | 2 +- scripts/upgrade | 1 + tests.toml | 2 +- 8 files changed, 14 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index c4459f7..3ad4412 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ Matomo is the leading Free/Libre open analytics platform. At the end of the five 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.16.0~ynh1 +**Shipped version:** 5.0.0~ynh1 **Demo:** https://demo.matomo.org diff --git a/README_fr.md b/README_fr.md index eaa2901..d687636 100644 --- a/README_fr.md +++ b/README_fr.md @@ -20,7 +20,7 @@ Matomo est la principale plateforme d'analyse ouverte Free/Libre. À la fin du p Matomo se veut une alternative logicielle gratuite à Google Analytics et est déjà utilisé sur plus de 1 400 000 sites Web. La confidentialité est intégrée ! -**Version incluse :** 4.16.0~ynh1 +**Version incluse :** 5.0.0~ynh1 **Démo :** https://demo.matomo.org diff --git a/manifest.toml b/manifest.toml index f094048..f604fde 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,9 +5,9 @@ name = "Matomo" description.en = "Analytics platform for measuring Web statistics" description.fr = "Plateforme d'analyse de mesure de statistiques Web" -version = "4.16.0~ynh1" +version = "5.0.0~ynh1" -maintainers = [] +maintainers = ["eric_G"] [upstream] license = "GPL-3.0-or-later" @@ -51,8 +51,9 @@ ram.runtime = "50M" [resources.sources] [resources.sources.main] - url = "https://builds.matomo.org/matomo-4.16.0.tar.gz" - sha256 = "385653e35f795935b0d97340c8688d8b15ba85234a0b72320696b990cf4f0959" + url = "https://github.com/matomo-org/matomo/releases/download/5.0.0/matomo-5.0.0.tar.gz" + sha256 = "d72b74dced0a9a93295043646ba1fc4577aa4a7d282b46baf7898933f8bbff65" + autoupdate.strategy = "latest_github_tag" [resources.system_user] diff --git a/scripts/change_url b/scripts/change_url index e25b156..fb8fd35 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -23,6 +23,9 @@ ynh_change_url_nginx_config #================================================= ynh_script_progression --message="Setuping a cron..." --weight=1 +path=$new_path +domain=$new_domain + ynh_add_config --template="cron" --destination="/etc/cron.d/$app" chown root: "/etc/cron.d/$app" chmod 644 "/etc/cron.d/$app" diff --git a/scripts/install b/scripts/install index c992b81..5e3005d 100755 --- a/scripts/install +++ b/scripts/install @@ -23,6 +23,7 @@ ynh_script_progression --message="Setting up source files..." --weight=4 # Download, check integrity, uncompress and patch the source from app.src ynh_setup_source --dest_dir="$install_dir" +chmod -R o-rwx "$install_dir" chown -R $app:www-data "$install_dir" #================================================= diff --git a/scripts/restore b/scripts/restore index adac2db..d8ff46c 100755 --- a/scripts/restore +++ b/scripts/restore @@ -17,6 +17,7 @@ ynh_script_progression --message="Restoring the app main directory..." --weight= ynh_restore_file --origin_path="$install_dir" +chmod -R o-rwx "$install_dir" chown -R $app:www-data "$install_dir" #================================================= @@ -31,7 +32,6 @@ ynh_mysql_connect_as --user=$db_user --password=$db_pwd --database=$db_name < ./ #================================================= ynh_script_progression --message="Restoring the PHP-FPM configuration..." --weight=2 -# Restore the file first, so it can have a backup if different ynh_restore_file --origin_path="/etc/php/$phpversion/fpm/pool.d/$app.conf" ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf" diff --git a/scripts/upgrade b/scripts/upgrade index 0d57267..de450cf 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -37,6 +37,7 @@ then fi fi +chmod -R o-rwx "$install_dir" chown -R $app:www-data "$install_dir" #================================================= diff --git a/tests.toml b/tests.toml index 9e01410..0d37965 100644 --- a/tests.toml +++ b/tests.toml @@ -6,4 +6,4 @@ test_format = 1.0 # Commits to test upgrade from # ------------------------------- - test_upgrade_from.9edf3d60.name = "Upgrade from 4.4.0" \ No newline at end of file + test_upgrade_from.990d0ae6d5c98db4de9342bb19e3797c9df0da73.name = "Upgrade from 4.16.0" \ No newline at end of file From 9fa96da8c6decd12e5a1a6058d594e3b3dbaad58 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Wed, 27 Dec 2023 21:14:27 +0100 Subject: [PATCH 16/25] Update upgrade --- scripts/upgrade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/upgrade b/scripts/upgrade index de450cf..342fa49 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -30,7 +30,7 @@ then ynh_setup_source --dest_dir="$install_dir" else # Download, check integrity, uncompress and patch the source from app.src - ynh_setup_source --dest_dir="$install_dir" --keep="config/config.ini.php" + ynh_setup_source --dest_dir="$install_dir" --keep="config/config.ini.php" --full_replace=1 chown -R $app:www-data "$install_dir" ynh_exec_as $app php${phpversion} $install_dir/console core:update -n From 547a9e2a392d849a6871cff4c3bdc3d21bd5ed51 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 28 Dec 2023 10:10:22 +0100 Subject: [PATCH 17/25] Update manifest.toml --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index f604fde..05f8e73 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "Matomo" description.en = "Analytics platform for measuring Web statistics" description.fr = "Plateforme d'analyse de mesure de statistiques Web" -version = "5.0.0~ynh1" +version = "5.0.0~ynh2" maintainers = ["eric_G"] From e6156ed3a80cc84ae0ff7f18001648595fab5ac2 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Thu, 28 Dec 2023 09:10:27 +0000 Subject: [PATCH 18/25] Auto-update README --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 3ad4412..f706a7d 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ Matomo is the leading Free/Libre open analytics platform. At the end of the five 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:** 5.0.0~ynh1 +**Shipped version:** 5.0.0~ynh2 **Demo:** https://demo.matomo.org diff --git a/README_fr.md b/README_fr.md index d687636..fad161e 100644 --- a/README_fr.md +++ b/README_fr.md @@ -20,7 +20,7 @@ Matomo est la principale plateforme d'analyse ouverte Free/Libre. À la fin du p Matomo se veut une alternative logicielle gratuite à Google Analytics et est déjà utilisé sur plus de 1 400 000 sites Web. La confidentialité est intégrée ! -**Version incluse :** 5.0.0~ynh1 +**Version incluse :** 5.0.0~ynh2 **Démo :** https://demo.matomo.org From e99ad9ef2f366a02d3562d1727505188e740f106 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Fri, 5 Jan 2024 12:38:06 +0100 Subject: [PATCH 19/25] Update manifest.toml --- manifest.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/manifest.toml b/manifest.toml index 05f8e73..16800ad 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "Matomo" description.en = "Analytics platform for measuring Web statistics" description.fr = "Plateforme d'analyse de mesure de statistiques Web" -version = "5.0.0~ynh2" +version = "5.0.1~ynh1" maintainers = ["eric_G"] @@ -51,8 +51,8 @@ ram.runtime = "50M" [resources.sources] [resources.sources.main] - url = "https://github.com/matomo-org/matomo/releases/download/5.0.0/matomo-5.0.0.tar.gz" - sha256 = "d72b74dced0a9a93295043646ba1fc4577aa4a7d282b46baf7898933f8bbff65" + url = "https://github.com/matomo-org/matomo/releases/download/5.0.1/matomo-5.0.1.tar.gz" + sha256 = "e1db485229da10fb6e11a6a781d95a22cc34c5db86e0079411a214274209f03c" autoupdate.strategy = "latest_github_tag" [resources.system_user] From f7a106898f31b5774345de3abd807a3440b6dcc5 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Fri, 5 Jan 2024 11:38:10 +0000 Subject: [PATCH 20/25] Auto-update README --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index f706a7d..bdfa44d 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ Matomo is the leading Free/Libre open analytics platform. At the end of the five 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:** 5.0.0~ynh2 +**Shipped version:** 5.0.1~ynh1 **Demo:** https://demo.matomo.org diff --git a/README_fr.md b/README_fr.md index fad161e..03dbc4a 100644 --- a/README_fr.md +++ b/README_fr.md @@ -20,7 +20,7 @@ Matomo est la principale plateforme d'analyse ouverte Free/Libre. À la fin du p Matomo se veut une alternative logicielle gratuite à Google Analytics et est déjà utilisé sur plus de 1 400 000 sites Web. La confidentialité est intégrée ! -**Version incluse :** 5.0.0~ynh2 +**Version incluse :** 5.0.1~ynh1 **Démo :** https://demo.matomo.org From 088b7fa948689a154a8470dbe8f92516dc9593dc Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Mon, 5 Feb 2024 21:32:55 +0100 Subject: [PATCH 21/25] Upgrade to v5.0.2 --- manifest.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/manifest.toml b/manifest.toml index 16800ad..8ef55e0 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "Matomo" description.en = "Analytics platform for measuring Web statistics" description.fr = "Plateforme d'analyse de mesure de statistiques Web" -version = "5.0.1~ynh1" +version = "5.0.2~ynh1" maintainers = ["eric_G"] @@ -51,8 +51,8 @@ ram.runtime = "50M" [resources.sources] [resources.sources.main] - url = "https://github.com/matomo-org/matomo/releases/download/5.0.1/matomo-5.0.1.tar.gz" - sha256 = "e1db485229da10fb6e11a6a781d95a22cc34c5db86e0079411a214274209f03c" + url = "https://github.com/matomo-org/matomo/archive/refs/tags/5.0.2.tar.gz" + sha256 = "5cc8bf3f2917363c465409794fa4b2c6ab203b81bac64f51199d70ac578879e5" autoupdate.strategy = "latest_github_tag" [resources.system_user] From c59bfcf548c11bd87a9136563a90ff8cfa6a0740 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Mon, 5 Feb 2024 20:32:58 +0000 Subject: [PATCH 22/25] Auto-update README --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index bdfa44d..7a07dbd 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ Matomo is the leading Free/Libre open analytics platform. At the end of the five 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:** 5.0.1~ynh1 +**Shipped version:** 5.0.2~ynh1 **Demo:** https://demo.matomo.org diff --git a/README_fr.md b/README_fr.md index 03dbc4a..794179c 100644 --- a/README_fr.md +++ b/README_fr.md @@ -20,7 +20,7 @@ Matomo est la principale plateforme d'analyse ouverte Free/Libre. À la fin du p Matomo se veut une alternative logicielle gratuite à Google Analytics et est déjà utilisé sur plus de 1 400 000 sites Web. La confidentialité est intégrée ! -**Version incluse :** 5.0.1~ynh1 +**Version incluse :** 5.0.2~ynh1 **Démo :** https://demo.matomo.org From cfbdc95a1ce6c76eeecc805b577a99e26ff1c418 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Wed, 14 Feb 2024 11:05:55 +0100 Subject: [PATCH 23/25] remove maintenance --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index 16800ad..cc77a31 100644 --- a/manifest.toml +++ b/manifest.toml @@ -7,7 +7,7 @@ description.fr = "Plateforme d'analyse de mesure de statistiques Web" version = "5.0.1~ynh1" -maintainers = ["eric_G"] +maintainers = [] [upstream] license = "GPL-3.0-or-later" From 5014089c345b4ba06be85f4673408e4fb617e936 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Wed, 14 Feb 2024 22:24:15 +0100 Subject: [PATCH 24/25] Update manifest.toml --- manifest.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/manifest.toml b/manifest.toml index 8ef55e0..06ddebe 100644 --- a/manifest.toml +++ b/manifest.toml @@ -51,8 +51,8 @@ ram.runtime = "50M" [resources.sources] [resources.sources.main] - url = "https://github.com/matomo-org/matomo/archive/refs/tags/5.0.2.tar.gz" - sha256 = "5cc8bf3f2917363c465409794fa4b2c6ab203b81bac64f51199d70ac578879e5" + url = "https://github.com/matomo-org/matomo/releases/download/5.0.2/matomo-5.0.2.tar.gz" + sha256 = "acb0128492edcdddc707525ef8ffa2f0629675e925c82dac4e798f474ecc77ef" autoupdate.strategy = "latest_github_tag" [resources.system_user] From 5d4d3e349f6039a59c761ea322846b6bc89364e6 Mon Sep 17 00:00:00 2001 From: OniriCorpe Date: Thu, 15 Feb 2024 01:33:52 +0100 Subject: [PATCH 25/25] Update manifest.toml --- manifest.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/manifest.toml b/manifest.toml index 54206cd..f681b46 100644 --- a/manifest.toml +++ b/manifest.toml @@ -53,7 +53,7 @@ ram.runtime = "50M" [resources.sources.main] url = "https://github.com/matomo-org/matomo/releases/download/5.0.2/matomo-5.0.2.tar.gz" sha256 = "acb0128492edcdddc707525ef8ffa2f0629675e925c82dac4e798f474ecc77ef" - autoupdate.strategy = "latest_github_tag" + autoupdate.strategy = "latest_github_release" [resources.system_user] @@ -67,4 +67,4 @@ ram.runtime = "50M" [resources.database] type = "mysql" - \ No newline at end of file +