From b874b9e33c805766e15b2e92bd8338fc1e57a7c1 Mon Sep 17 00:00:00 2001 From: OniriCorpe Date: Wed, 3 Apr 2024 00:08:25 +0200 Subject: [PATCH 1/3] Testing 5.0.3~ynh1 (#117) * Upgrade to v5.0.3 (#116) Co-authored-by: OniriCorpe * Auto-update READMEs --------- Co-authored-by: YunoHost Bot Co-authored-by: eric_G <46165813+ericgaspar@users.noreply.github.com> Co-authored-by: yunohost-bot --- ALL_README.md | 2 +- README.md | 4 ++-- README_eu.md | 52 +++++++++++++++++++++++++++++++++++++++++++++++++++ README_fr.md | 2 +- README_gl.md | 2 +- manifest.toml | 7 ++++--- 6 files changed, 61 insertions(+), 8 deletions(-) create mode 100644 README_eu.md diff --git a/ALL_README.md b/ALL_README.md index 3d6c579..77b7509 100644 --- a/ALL_README.md +++ b/ALL_README.md @@ -1,6 +1,6 @@ # All available README files by language - [Read the README in English](README.md) +- [Irakurri README euskaraz](README_eu.md) - [Lire le README en français](README_fr.md) - [Le o README en galego](README_gl.md) -- [Leggi il “README” in italiano](README_it.md) diff --git a/README.md b/README.md index d8dffb5..7625187 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ It shall NOT be edited by hand. [![Install Matomo with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=matomo) -*[Read this README is other languages.](./ALL_README.md)* +*[Read this README in other languages.](./ALL_README.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.* @@ -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.2~ynh1 +**Shipped version:** 5.0.3~ynh1 **Demo:** diff --git a/README_eu.md b/README_eu.md new file mode 100644 index 0000000..4e818f8 --- /dev/null +++ b/README_eu.md @@ -0,0 +1,52 @@ + + +# Matomo YunoHost-erako + +[![Integrazio maila](https://dash.yunohost.org/integration/matomo.svg)](https://dash.yunohost.org/appci/app/matomo) ![Funtzionamendu egoera](https://ci-apps.yunohost.org/ci/badges/matomo.status.svg) ![Mantentze egoera](https://ci-apps.yunohost.org/ci/badges/matomo.maintain.svg) + +[![Instalatu Matomo YunoHost-ekin](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=matomo) + +*[Irakurri README hau beste hizkuntzatan.](./ALL_README.md)* + +> *Pakete honek Matomo YunoHost zerbitzari batean azkar eta zailtasunik gabe instalatzea ahalbidetzen dizu.* +> *YunoHost ez baduzu, kontsultatu [gida](https://yunohost.org/install) nola instalatu ikasteko.* + +## Aurreikuspena + +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 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! + + +**Paketatutako bertsioa:** 5.0.3~ynh1 + +**Demoa:** + +## Pantaila-argazkiak + +![Matomo(r)en pantaila-argazkia](./doc/screenshots/screenshot.png) + +## Dokumentazioa eta baliabideak + +- Aplikazioaren webgune ofiziala: +- Administratzaileen dokumentazio ofiziala: +- Jatorrizko aplikazioaren kode-gordailua: +- YunoHost Denda: +- Eman errore baten berri: + +## Garatzaileentzako informazioa + +Bidali `pull request`a [`testing` abarrera](https://github.com/YunoHost-Apps/matomo_ynh/tree/testing). + +`testing` abarra probatzeko, ondorengoa egin: + +```bash +sudo yunohost app install https://github.com/YunoHost-Apps/matomo_ynh/tree/testing --debug +edo +sudo yunohost app upgrade matomo -u https://github.com/YunoHost-Apps/matomo_ynh/tree/testing --debug +``` + +**Informazio gehiago aplikazioaren paketatzeari buruz:** diff --git a/README_fr.md b/README_fr.md index 75a9ed6..eb7319a 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.2~ynh1 +**Version incluse :** 5.0.3~ynh1 **Démo :** diff --git a/README_gl.md b/README_gl.md index 9cf76ec..3887e07 100644 --- a/README_gl.md +++ b/README_gl.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! -**Versión proporcionada:** 5.0.2~ynh1 +**Versión proporcionada:** 5.0.3~ynh1 **Demo:** diff --git a/manifest.toml b/manifest.toml index f681b46..1f87cb9 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.2~ynh1" +version = "5.0.3~ynh1" maintainers = [] @@ -51,9 +51,10 @@ ram.runtime = "50M" [resources.sources] [resources.sources.main] - url = "https://github.com/matomo-org/matomo/releases/download/5.0.2/matomo-5.0.2.tar.gz" - sha256 = "acb0128492edcdddc707525ef8ffa2f0629675e925c82dac4e798f474ecc77ef" + url = "https://github.com/matomo-org/matomo/releases/download/5.0.3/matomo-5.0.3.tar.gz" + sha256 = "cd656ee7df4b29ac453456c6b9708d8264093ac2c99d6669d2830f31624cd626" autoupdate.strategy = "latest_github_release" + autoupdate.asset = "^matomo-.*tar.gz$" [resources.system_user] From 978faf643ef81255303454b1cccc3825885535e2 Mon Sep 17 00:00:00 2001 From: CodeShakingSheep <19874562+CodeShakingSheep@users.noreply.github.com> Date: Wed, 22 May 2024 01:38:31 -0500 Subject: [PATCH 2/3] Change url: Update trusted hosts (#119) * Testing 5.0.3~ynh1 (#117) * Upgrade to v5.0.3 (#116) Co-authored-by: OniriCorpe * Auto-update READMEs --------- Co-authored-by: YunoHost Bot Co-authored-by: eric_G <46165813+ericgaspar@users.noreply.github.com> Co-authored-by: yunohost-bot * Update change_url Update trusted_hosts in config.ini.php * Update scripts/change_url Co-authored-by: Tagada <36127788+Tagadda@users.noreply.github.com> * Update change_url Create config.ini.php if it doesn't exist * Update change_url Only alter config file if it exists * Update nginx.conf --------- Co-authored-by: OniriCorpe Co-authored-by: YunoHost Bot Co-authored-by: eric_G <46165813+ericgaspar@users.noreply.github.com> Co-authored-by: yunohost-bot Co-authored-by: Tagada <36127788+Tagadda@users.noreply.github.com> --- conf/nginx.conf | 14 +++++++------- scripts/change_url | 16 ++++++++++++++++ 2 files changed, 23 insertions(+), 7 deletions(-) diff --git a/conf/nginx.conf b/conf/nginx.conf index 54b5309..6915e58 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -1,5 +1,5 @@ #sub_path_only rewrite ^__PATH__$ __PATH__/ permanent; -location ^~ __PATH__/ { +location __PATH__/ { # Path to source alias __INSTALL_DIR__/; @@ -33,27 +33,27 @@ location ^~ __PATH__/ { } ## disable all access to the following directories - location ^~ __PATH__/config/ { + location ~ ^__PATH__/config/ { deny all; return 403; } - location ^~ __PATH__/tmp/ { + location ~ ^__PATH__/tmp/ { deny all; return 403; } - location ^~ __PATH__/core/ { + location ~ ^__PATH__/core/ { deny all; return 403; } - location ^~ __PATH__/lang/ { + location ~ ^__PATH__/lang/ { deny all; return 403; } - location ~ __PATH__/\.ht { + location ~ ^__PATH__/\.ht { deny all; return 403; } @@ -78,7 +78,7 @@ location ^~ __PATH__/ { } ## properly display textfiles in root directory - location ~__PATH__/(.*\.md|LEGALNOTICE|LICENSE) { + location ~ ^__PATH__/(.*\.md|LEGALNOTICE|LICENSE) { default_type text/plain; } diff --git a/scripts/change_url b/scripts/change_url index fb8fd35..fc21bd7 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -18,6 +18,22 @@ ynh_script_progression --message="Updating NGINX web server configuration..." -- ynh_change_url_nginx_config +#================================================= +# SPECIFIC MODIFICATIONS +#================================================= +# RECONFIGURING MATOMO +#================================================= +ynh_script_progression --message="Reconfiguring Matomo..." --weight=2 + +if [[ -f "$install_dir/config/config.ini.php" ]]; then + # config.ini.php is only created during the post-install process... + # it is therefore not present when the CI tests are carried out... + # This condition is only for CI test to go through the upgrade process + + # See https://matomo.org/faq/how-to-install/faq_18/ + ynh_replace_string --match_string="$old_domain" --replace_string="$new_domain" --target_file="$install_dir/config/config.ini.php" +fi + #================================================= # SETUP A CRON #================================================= From 6fa02b60536710e63e51c038e02d014628271575 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Wed, 22 May 2024 06:38:35 +0000 Subject: [PATCH 3/3] Auto-update READMEs --- ALL_README.md | 2 ++ README_es.md | 52 +++++++++++++++++++++++++++++++++++++++++++++++ README_zh_Hans.md | 52 +++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 106 insertions(+) create mode 100644 README_es.md create mode 100644 README_zh_Hans.md diff --git a/ALL_README.md b/ALL_README.md index 77b7509..152f2e7 100644 --- a/ALL_README.md +++ b/ALL_README.md @@ -1,6 +1,8 @@ # All available README files by language - [Read the README in English](README.md) +- [Lea el README en español](README_es.md) - [Irakurri README euskaraz](README_eu.md) - [Lire le README en français](README_fr.md) - [Le o README en galego](README_gl.md) +- [阅读中文（简体）的 README](README_zh_Hans.md) diff --git a/README_es.md b/README_es.md new file mode 100644 index 0000000..fa16b37 --- /dev/null +++ b/README_es.md @@ -0,0 +1,52 @@ + + +# Matomo para Yunohost + +[![Nivel de integración](https://dash.yunohost.org/integration/matomo.svg)](https://dash.yunohost.org/appci/app/matomo) ![Estado funcional](https://ci-apps.yunohost.org/ci/badges/matomo.status.svg) ![Estado En Mantención](https://ci-apps.yunohost.org/ci/badges/matomo.maintain.svg) + +[![Instalar Matomo con Yunhost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=matomo) + +*[Leer este README en otros idiomas.](./ALL_README.md)* + +> *Este paquete le permite instalarMatomo rapidamente y simplement en un servidor YunoHost.* +> *Si no tiene YunoHost, visita [the guide](https://yunohost.org/install) para aprender como instalarla.* + +## Descripción general + +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 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! + + +**Versión actual:** 5.0.3~ynh1 + +**Demo:** + +## Capturas + +![Captura de Matomo](./doc/screenshots/screenshot.png) + +## Documentaciones y recursos + +- Sitio web oficial: +- Documentación administrador oficial: +- Repositorio del código fuente oficial de la aplicación : +- Catálogo YunoHost: +- Reportar un error: + +## Información para desarrolladores + +Por favor enviar sus correcciones a la [`branch testing`](https://github.com/YunoHost-Apps/matomo_ynh/tree/testing + +Para probar la rama `testing`, sigue asÍ: + +```bash +sudo yunohost app install https://github.com/YunoHost-Apps/matomo_ynh/tree/testing --debug +o +sudo yunohost app upgrade matomo -u https://github.com/YunoHost-Apps/matomo_ynh/tree/testing --debug +``` + +**Mas informaciones sobre el empaquetado de aplicaciones:** diff --git a/README_zh_Hans.md b/README_zh_Hans.md new file mode 100644 index 0000000..20faa31 --- /dev/null +++ b/README_zh_Hans.md @@ -0,0 +1,52 @@ + + +# YunoHost 上的 Matomo + +[![集成程度](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) + +[![使用 YunoHost 安装 Matomo](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=matomo) + +*[阅读此 README 的其它语言版本。](./ALL_README.md)* + +> *通过此软件包，您可以在 YunoHost 服务器上快速、简单地安装 Matomo。* +> *如果您还没有 YunoHost，请参阅[指南](https://yunohost.org/install)了解如何安装它。* + +## 概况 + +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 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! + + +**分发版本：** 5.0.3~ynh1 + +**演示：** + +## 截图 + +![Matomo 的截图](./doc/screenshots/screenshot.png) + +## 文档与资源 + +- 官方应用网站： +- 官方管理文档： +- 上游应用代码库： +- YunoHost 商店： +- 报告 bug： + +## 开发者信息 + +请向 [`testing` 分支](https://github.com/YunoHost-Apps/matomo_ynh/tree/testing) 发送拉取请求。 + +如要尝试 `testing` 分支，请这样操作： + +```bash +sudo yunohost app install https://github.com/YunoHost-Apps/matomo_ynh/tree/testing --debug +或 +sudo yunohost app upgrade matomo -u https://github.com/YunoHost-Apps/matomo_ynh/tree/testing --debug +``` + +**有关应用打包的更多信息：**