From d4928173975cff09a4f80797215577f7fdbf8f82 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Wed, 10 Jul 2024 03:32:57 +0200 Subject: [PATCH 1/4] Upgrade to v11.6.1 --- manifest.toml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/manifest.toml b/manifest.toml index 20e269f..27edcbd 100644 --- a/manifest.toml +++ b/manifest.toml @@ -7,7 +7,7 @@ name = "Emoncms" description.en = "Processing, logging and visualising energy, temperature and other environmental data" description.fr = "Traitement enregistrement et la visualisation de l'énergie, de la température et d'autres données environnementales" -version = "11.5.6~ynh1" +version = "11.6.1~ynh1" maintainers = [] @@ -44,14 +44,14 @@ ram.runtime = "50M" [resources] [resources.sources] [resources.sources.main] - url = "https://github.com/emoncms/emoncms/archive/refs/tags/11.5.6.tar.gz" - sha256 = "35e311ea9712f306019e8c530f05a0e71ef1188ef253ccc3706a521bccd5fa47" + url = "https://github.com/emoncms/emoncms/archive/refs/tags/11.6.1.tar.gz" + sha256 = "9ed830749db6fcbd20b32a55af68dca33b72817ddb34a9e99f836b600811ba19" autoupdate.strategy = "latest_github_tag" autoupdate.asset = "tarball" [resources.sources.graph] - url = "https://github.com/emoncms/emoncms/archive/refs/tags/11.5.6.tar.gz" - sha256 = "35e311ea9712f306019e8c530f05a0e71ef1188ef253ccc3706a521bccd5fa47" + url = "https://github.com/emoncms/emoncms/archive/refs/tags/11.6.1.tar.gz" + sha256 = "9ed830749db6fcbd20b32a55af68dca33b72817ddb34a9e99f836b600811ba19" in_subdir = false autoupdate.strategy = "latest_github_tag" autoupdate.asset = "tarball" From d19213d99feeb99caa0c83c4391b52bda6fae9ed Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Wed, 10 Jul 2024 15:03:41 +0000 Subject: [PATCH 2/4] Auto-update READMEs --- README.md | 4 ++-- README_es.md | 4 ++-- README_eu.md | 4 ++-- README_fr.md | 4 ++-- README_gl.md | 4 ++-- README_zh_Hans.md | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index eabf525..ee3a42f 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ It shall NOT be edited by hand. # Emoncms for YunoHost -[![Integration level](https://dash.yunohost.org/integration/emoncms.svg)](https://dash.yunohost.org/appci/app/emoncms) ![Working status](https://ci-apps.yunohost.org/ci/badges/emoncms.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/emoncms.maintain.svg) +[![Integration level](https://dash.yunohost.org/integration/emoncms.svg)](https://ci-apps.yunohost.org/ci/apps/emoncms/) ![Working status](https://ci-apps.yunohost.org/ci/badges/emoncms.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/emoncms.maintain.svg) [![Install Emoncms with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=emoncms) @@ -19,7 +19,7 @@ It shall NOT be edited by hand. Emoncms is an open-source web application for processing, logging and visualising energy, temperature and other environmental data and is part of the OpenEnergyMonitor project. -**Shipped version:** 11.5.6~ynh1 +**Shipped version:** 11.6.1~ynh1 ## Screenshots diff --git a/README_es.md b/README_es.md index 5ddd980..e94e222 100644 --- a/README_es.md +++ b/README_es.md @@ -5,7 +5,7 @@ No se debe editar a mano. # Emoncms para Yunohost -[![Nivel de integración](https://dash.yunohost.org/integration/emoncms.svg)](https://dash.yunohost.org/appci/app/emoncms) ![Estado funcional](https://ci-apps.yunohost.org/ci/badges/emoncms.status.svg) ![Estado En Mantención](https://ci-apps.yunohost.org/ci/badges/emoncms.maintain.svg) +[![Nivel de integración](https://dash.yunohost.org/integration/emoncms.svg)](https://ci-apps.yunohost.org/ci/apps/emoncms/) ![Estado funcional](https://ci-apps.yunohost.org/ci/badges/emoncms.status.svg) ![Estado En Mantención](https://ci-apps.yunohost.org/ci/badges/emoncms.maintain.svg) [![Instalar Emoncms con Yunhost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=emoncms) @@ -19,7 +19,7 @@ No se debe editar a mano. Emoncms is an open-source web application for processing, logging and visualising energy, temperature and other environmental data and is part of the OpenEnergyMonitor project. -**Versión actual:** 11.5.6~ynh1 +**Versión actual:** 11.6.1~ynh1 ## Capturas diff --git a/README_eu.md b/README_eu.md index 3d6d31f..0eac8ba 100644 --- a/README_eu.md +++ b/README_eu.md @@ -5,7 +5,7 @@ EZ editatu eskuz. # Emoncms YunoHost-erako -[![Integrazio maila](https://dash.yunohost.org/integration/emoncms.svg)](https://dash.yunohost.org/appci/app/emoncms) ![Funtzionamendu egoera](https://ci-apps.yunohost.org/ci/badges/emoncms.status.svg) ![Mantentze egoera](https://ci-apps.yunohost.org/ci/badges/emoncms.maintain.svg) +[![Integrazio maila](https://dash.yunohost.org/integration/emoncms.svg)](https://ci-apps.yunohost.org/ci/apps/emoncms/) ![Funtzionamendu egoera](https://ci-apps.yunohost.org/ci/badges/emoncms.status.svg) ![Mantentze egoera](https://ci-apps.yunohost.org/ci/badges/emoncms.maintain.svg) [![Instalatu Emoncms YunoHost-ekin](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=emoncms) @@ -19,7 +19,7 @@ EZ editatu eskuz. Emoncms is an open-source web application for processing, logging and visualising energy, temperature and other environmental data and is part of the OpenEnergyMonitor project. -**Paketatutako bertsioa:** 11.5.6~ynh1 +**Paketatutako bertsioa:** 11.6.1~ynh1 ## Pantaila-argazkiak diff --git a/README_fr.md b/README_fr.md index 2545e59..2a3f440 100644 --- a/README_fr.md +++ b/README_fr.md @@ -5,7 +5,7 @@ Il NE doit PAS être modifié à la main. # Emoncms pour YunoHost -[![Niveau d’intégration](https://dash.yunohost.org/integration/emoncms.svg)](https://dash.yunohost.org/appci/app/emoncms) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/emoncms.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/emoncms.maintain.svg) +[![Niveau d’intégration](https://dash.yunohost.org/integration/emoncms.svg)](https://ci-apps.yunohost.org/ci/apps/emoncms/) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/emoncms.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/emoncms.maintain.svg) [![Installer Emoncms avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=emoncms) @@ -19,7 +19,7 @@ Il NE doit PAS être modifié à la main. Emoncms is an open-source web application for processing, logging and visualising energy, temperature and other environmental data and is part of the OpenEnergyMonitor project. -**Version incluse :** 11.5.6~ynh1 +**Version incluse :** 11.6.1~ynh1 ## Captures d’écran diff --git a/README_gl.md b/README_gl.md index abc31c8..f199ced 100644 --- a/README_gl.md +++ b/README_gl.md @@ -5,7 +5,7 @@ NON debe editarse manualmente. # Emoncms para YunoHost -[![Nivel de integración](https://dash.yunohost.org/integration/emoncms.svg)](https://dash.yunohost.org/appci/app/emoncms) ![Estado de funcionamento](https://ci-apps.yunohost.org/ci/badges/emoncms.status.svg) ![Estado de mantemento](https://ci-apps.yunohost.org/ci/badges/emoncms.maintain.svg) +[![Nivel de integración](https://dash.yunohost.org/integration/emoncms.svg)](https://ci-apps.yunohost.org/ci/apps/emoncms/) ![Estado de funcionamento](https://ci-apps.yunohost.org/ci/badges/emoncms.status.svg) ![Estado de mantemento](https://ci-apps.yunohost.org/ci/badges/emoncms.maintain.svg) [![Instalar Emoncms con YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=emoncms) @@ -19,7 +19,7 @@ NON debe editarse manualmente. Emoncms is an open-source web application for processing, logging and visualising energy, temperature and other environmental data and is part of the OpenEnergyMonitor project. -**Versión proporcionada:** 11.5.6~ynh1 +**Versión proporcionada:** 11.6.1~ynh1 ## Capturas de pantalla diff --git a/README_zh_Hans.md b/README_zh_Hans.md index 04320cd..0192b7b 100644 --- a/README_zh_Hans.md +++ b/README_zh_Hans.md @@ -5,7 +5,7 @@ # YunoHost 上的 Emoncms -[![集成程度](https://dash.yunohost.org/integration/emoncms.svg)](https://dash.yunohost.org/appci/app/emoncms) ![工作状态](https://ci-apps.yunohost.org/ci/badges/emoncms.status.svg) ![维护状态](https://ci-apps.yunohost.org/ci/badges/emoncms.maintain.svg) +[![集成程度](https://dash.yunohost.org/integration/emoncms.svg)](https://ci-apps.yunohost.org/ci/apps/emoncms/) ![工作状态](https://ci-apps.yunohost.org/ci/badges/emoncms.status.svg) ![维护状态](https://ci-apps.yunohost.org/ci/badges/emoncms.maintain.svg) [![使用 YunoHost 安装 Emoncms](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=emoncms) @@ -19,7 +19,7 @@ Emoncms is an open-source web application for processing, logging and visualising energy, temperature and other environmental data and is part of the OpenEnergyMonitor project. -**分发版本：** 11.5.6~ynh1 +**分发版本：** 11.6.1~ynh1 ## 截图 From 440d750f6ba137ca2d40e1f579593b3ca2e97891 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20Pi=C3=A9dallu?= Date: Wed, 10 Jul 2024 17:14:49 +0200 Subject: [PATCH 3/4] Fix settings.ini --- conf/example.settings.ini | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/conf/example.settings.ini b/conf/example.settings.ini index e983c13..db58b48 100644 --- a/conf/example.settings.ini +++ b/conf/example.settings.ini @@ -43,8 +43,8 @@ password = 'password' engines_hidden = [0,10] ; Buffer data to be written to redisbuffer[enabled] = false -phpfina[data_dir] = '__DATA_DIR__/phpfina/' -phptimeseries[data_dir] = '__DATA_DIR__/phptimeseries/' +phpfina[datadir] = '__DATA_DIR__/phpfina/' +phptimeseries[datadir] = '__DATA_DIR__/phptimeseries/' ; Enable the graph module if you have it installed [interface] @@ -57,7 +57,7 @@ feedviewpath = "graph/" ; git -C /opt/emoncms/modules clone -b 'v5.4.8' --single-branch https://github.com/swiftmailer/swiftmailer.git [smtp] ; Email address to email proccessed input values -;default_emailto = 'root@__DOMAIN__' +default_emailto = 'root@__DOMAIN__' host = "localhost" ; 25, 465, 587 From 318fd1148e5f6d3cb0478b90742b3ad4e985749f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20Pi=C3=A9dallu?= Date: Wed, 10 Jul 2024 17:29:23 +0200 Subject: [PATCH 4/4] Fix nginx config --- conf/nginx.conf | 40 ++++++++++++++++++++++------------------ 1 file changed, 22 insertions(+), 18 deletions(-) diff --git a/conf/nginx.conf b/conf/nginx.conf index 161d2f2..f4847fa 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -1,29 +1,33 @@ #sub_path_only rewrite ^__PATH__$ __PATH__/ permanent; location __PATH__/ { - # Path to source - alias __INSTALL_DIR__/; + # Path to source + alias __INSTALL_DIR__/; - index index.php; + location ~* ^.+.(jpg|jpeg|gif|css|png|js|ico|xml)$ { + try_files $uri $uri; + } - # Common parameter to increase upload size limit in conjunction with dedicated php-fpm file - client_max_body_size 50M; - - rewrite ^/(.*)$ /index.php?q=$1 last; + index index.php; try_files $uri $uri/ index.php; - location ~ [^/]\.php(/|$) { - fastcgi_split_path_info ^(.+?\.php)(/.*)$; - fastcgi_pass unix:/var/run/php/php__PHPVERSION__-fpm-__NAME__.sock; + rewrite ^/(.*)$ /index.php?q=$1 last; - fastcgi_index index.php; - include fastcgi_params; - fastcgi_param REMOTE_USER $remote_user; - fastcgi_param PATH_INFO $fastcgi_path_info; - fastcgi_param SCRIPT_FILENAME $request_filename; - } + # Common parameter to increase upload size limit in conjunction with dedicated php-fpm file + client_max_body_size 50M; - # Include SSOWAT user panel. - include conf.d/yunohost_panel.conf.inc; + location ~ [^/]\.php(/|$) { + fastcgi_split_path_info ^(.+?\.php)(/.*)$; + fastcgi_pass unix:/var/run/php/php__PHPVERSION__-fpm-__NAME__.sock; + + fastcgi_index index.php; + include fastcgi_params; + fastcgi_param REMOTE_USER $remote_user; + fastcgi_param PATH_INFO $fastcgi_path_info; + fastcgi_param SCRIPT_FILENAME $request_filename; + } + + # Include SSOWAT user panel. + include conf.d/yunohost_panel.conf.inc; }