Merge branch 'testing' of https://github.com/YunoHost-Apps/matomo_ynh into testing

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)

README_es.md

@@ -0,0 +1,52 @@
+<!--
+Este archivo README esta generado automaticamente<https://github.com/YunoHost/apps/tree/master/tools/readme_generator>
+No se debe editar a mano.
+-->
+
+# 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:** <https://demo.matomo.org>
+
+## Capturas
+
+![Captura de Matomo](./doc/screenshots/screenshot.png)
+
+## Documentaciones y recursos
+
+- Sitio web oficial: <https://matomo.org>
+- Documentación administrador oficial: <https://matomo.org/docs>
+- Repositorio del código fuente oficial de la aplicación : <https://github.com/matomo-org/matomo>
+- Catálogo YunoHost: <https://apps.yunohost.org/app/matomo>
+- Reportar un error: <https://github.com/YunoHost-Apps/matomo_ynh/issues>
+
+## 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:** <https://yunohost.org/packaging_apps>

README_zh_Hans.md

@@ -0,0 +1,52 @@
+<!--
+注意：此 README 由 <https://github.com/YunoHost/apps/tree/master/tools/readme_generator> 自动生成
+请勿手动编辑。
+-->
+
+# 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
+
+**演示：** <https://demo.matomo.org>
+
+## 截图
+
+![Matomo 的截图](./doc/screenshots/screenshot.png)
+
+## 文档与资源
+
+- 官方应用网站： <https://matomo.org>
+- 官方管理文档： <https://matomo.org/docs>
+- 上游应用代码库： <https://github.com/matomo-org/matomo>
+- YunoHost 商店： <https://apps.yunohost.org/app/matomo>
+- 报告 bug： <https://github.com/YunoHost-Apps/matomo_ynh/issues>
+
+## 开发者信息
+
+请向 [`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
+```
+
+**有关应用打包的更多信息：** <https://yunohost.org/packaging_apps>

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;
   }
 

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
 #=================================================