Merge 8d2204d189 into 76b4e208b1

2024-09-03 19:26:11 +02:00 · 2024-07-22 21:27:27 +02:00 · 2024-07-22 21:27:27 +02:00 · 6b8f648894
commit 6b8f648894
parent 76b4e208b1 8d2204d189
18 changed files with 108 additions and 132 deletions
--- a/ALL_README.md
+++ b/ALL_README.md
@ -5,4 +5,5 @@
 - [Irakurri README euskaraz](README_eu.md)
 - [Lire le README en français](README_fr.md)
 - [Le o README en galego](README_gl.md)
+- [Baca README dalam bahasa bahasa Indonesia](README_id.md)
 - [阅读中文（简体）的 README](README_zh_Hans.md)
--- a/README.md
+++ b/README.md
@ -5,7 +5,7 @@ It shall NOT be edited by hand.

 # InfluxDB v2 for YunoHost

-[![Integration level](https://dash.yunohost.org/integration/influxdb_v2.svg)](https://dash.yunohost.org/appci/app/influxdb_v2) ![Working status](https://ci-apps.yunohost.org/ci/badges/influxdb_v2.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/influxdb_v2.maintain.svg)
+[![Integration level](https://dash.yunohost.org/integration/influxdb_v2.svg)](https://ci-apps.yunohost.org/ci/apps/influxdb_v2/) ![Working status](https://ci-apps.yunohost.org/ci/badges/influxdb_v2.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/influxdb_v2.maintain.svg)

 [![Install InfluxDB v2 with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=influxdb_v2)

--- a/README_es.md
+++ b/README_es.md
@ -5,7 +5,7 @@ No se debe editar a mano.

 # InfluxDB v2 para Yunohost

-[![Nivel de integración](https://dash.yunohost.org/integration/influxdb_v2.svg)](https://dash.yunohost.org/appci/app/influxdb_v2) ![Estado funcional](https://ci-apps.yunohost.org/ci/badges/influxdb_v2.status.svg) ![Estado En Mantención](https://ci-apps.yunohost.org/ci/badges/influxdb_v2.maintain.svg)
+[![Nivel de integración](https://dash.yunohost.org/integration/influxdb_v2.svg)](https://ci-apps.yunohost.org/ci/apps/influxdb_v2/) ![Estado funcional](https://ci-apps.yunohost.org/ci/badges/influxdb_v2.status.svg) ![Estado En Mantención](https://ci-apps.yunohost.org/ci/badges/influxdb_v2.maintain.svg)

 [![Instalar InfluxDB v2 con Yunhost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=influxdb_v2)

--- a/README_eu.md
+++ b/README_eu.md
@ -5,7 +5,7 @@ EZ editatu eskuz.

 # InfluxDB v2 YunoHost-erako

-[![Integrazio maila](https://dash.yunohost.org/integration/influxdb_v2.svg)](https://dash.yunohost.org/appci/app/influxdb_v2) ![Funtzionamendu egoera](https://ci-apps.yunohost.org/ci/badges/influxdb_v2.status.svg) ![Mantentze egoera](https://ci-apps.yunohost.org/ci/badges/influxdb_v2.maintain.svg)
+[![Integrazio maila](https://dash.yunohost.org/integration/influxdb_v2.svg)](https://ci-apps.yunohost.org/ci/apps/influxdb_v2/) ![Funtzionamendu egoera](https://ci-apps.yunohost.org/ci/badges/influxdb_v2.status.svg) ![Mantentze egoera](https://ci-apps.yunohost.org/ci/badges/influxdb_v2.maintain.svg)

 [![Instalatu InfluxDB v2 YunoHost-ekin](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=influxdb_v2)

--- a/README_fr.md
+++ b/README_fr.md
@ -5,7 +5,7 @@ Il NE doit PAS être modifié à la main.

 # InfluxDB v2 pour YunoHost

-[![Niveau d’intégration](https://dash.yunohost.org/integration/influxdb_v2.svg)](https://dash.yunohost.org/appci/app/influxdb_v2) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/influxdb_v2.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/influxdb_v2.maintain.svg)
+[![Niveau d’intégration](https://dash.yunohost.org/integration/influxdb_v2.svg)](https://ci-apps.yunohost.org/ci/apps/influxdb_v2/) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/influxdb_v2.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/influxdb_v2.maintain.svg)

 [![Installer InfluxDB v2 avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=influxdb_v2)

--- a/README_gl.md
+++ b/README_gl.md
@ -5,7 +5,7 @@ NON debe editarse manualmente.

 # InfluxDB v2 para YunoHost

-[![Nivel de integración](https://dash.yunohost.org/integration/influxdb_v2.svg)](https://dash.yunohost.org/appci/app/influxdb_v2) ![Estado de funcionamento](https://ci-apps.yunohost.org/ci/badges/influxdb_v2.status.svg) ![Estado de mantemento](https://ci-apps.yunohost.org/ci/badges/influxdb_v2.maintain.svg)
+[![Nivel de integración](https://dash.yunohost.org/integration/influxdb_v2.svg)](https://ci-apps.yunohost.org/ci/apps/influxdb_v2/) ![Estado de funcionamento](https://ci-apps.yunohost.org/ci/badges/influxdb_v2.status.svg) ![Estado de mantemento](https://ci-apps.yunohost.org/ci/badges/influxdb_v2.maintain.svg)

 [![Instalar InfluxDB v2 con YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=influxdb_v2)

--- a/README_id.md
+++ b/README_id.md
@ -0,0 +1,66 @@
+<!--
+N.B.: README ini dibuat secara otomatis oleh <https://github.com/YunoHost/apps/tree/master/tools/readme_generator>
+Ini TIDAK boleh diedit dengan tangan.
+-->
+
+# InfluxDB v2 untuk YunoHost
+
+[![Tingkat integrasi](https://dash.yunohost.org/integration/influxdb_v2.svg)](https://ci-apps.yunohost.org/ci/apps/influxdb_v2/) ![Status kerja](https://ci-apps.yunohost.org/ci/badges/influxdb_v2.status.svg) ![Status pemeliharaan](https://ci-apps.yunohost.org/ci/badges/influxdb_v2.maintain.svg)
+
+[![Pasang InfluxDB v2 dengan YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=influxdb_v2)
+
+*[Baca README ini dengan bahasa yang lain.](./ALL_README.md)*
+
+> *Paket ini memperbolehkan Anda untuk memasang InfluxDB v2 secara cepat dan mudah pada server YunoHost.*  
+> *Bila Anda tidak mempunyai YunoHost, silakan berkonsultasi dengan [panduan](https://yunohost.org/install) untuk mempelajari bagaimana untuk memasangnya.*
+
+## Ringkasan
+
+InfluxDB is a time series database designed to handle high volumes of time-based data, such as metrics, events, and analytics from software, IoT devices, or other sources.
+
+## Features
+
+- **Unified Experience**: InfluxDB delivers a Smart Data Platform with everything you need in a single binary. This includes a multi-tenanted time series database, user interface, dashboarding tools, background processing, and a monitoring agent.
+
+- **Developer Productivity**: The platform is optimized for developer productivity. Everything in InfluxDB, from data ingestion to querying and visualization, is accessible through a unified API. This ensures a faster development cycle as all platform components can be programmatically accessed and controlled.
+
+- **Deep Insights**: Structure your queries and separate common logic into functions and libraries. Enrich your time series data with other SQL data stores or cloud-based data stores.
+
+- **APIs & Toolset**: InfluxDB offers a RESTful API and a range of client libraries for various programming languages. It also provides Telegraf, an open-source collector agent with over 300+ plugins, and Flux, a functional language designed specifically for time series data.
+
+- **High Performance**: The platform is optimized for large data workloads, offering high throughput and series cardinality. It supports both batch and streaming data ingestion from millions of sources.
+
+- **Community & Ecosystem**: Supported by a vast community, InfluxDB integrates with various tools and platforms. This includes connectors to Grafana, Google Data Studio, and more. It also offers InfluxDB Templates to share monitoring solutions with the community.
+
+- **User Interface**: A top-tier UI is provided, featuring a Data Explorer, dashboarding tools, and a script editor. This ensures quick data browsing, visualization, and Flux script development.
+
+By leveraging InfluxDB v2, users can gain deeper insights from their time series data, ensuring efficient data analysis and visualization. Whether you're a developer looking for a streamlined platform or an organization aiming for data-driven decisions, InfluxDB v2 is the tool to consider.
+
+
+
+**Versi terkirim:** 2.7.1~ynh1
+
+## Tangkapan Layar
+
+![Tangkapan Layar pada InfluxDB v2](./doc/screenshots/influxdb_v2_data_explorer.png)
+
+## Dokumentasi dan sumber daya
+
+- Website aplikasi resmi: <https://www.influxdata.com/>
+- Dokumentasi admin resmi: <https://docs.influxdata.com/influxdb/v2.0/>
+- Gudang YunoHost: <https://apps.yunohost.org/app/influxdb_v2>
+- Laporkan bug: <https://github.com/YunoHost-Apps/influxdb_v2_ynh/issues>
+
+## Info developer
+
+Silakan kirim pull request ke [`testing` branch](https://github.com/YunoHost-Apps/influxdb_v2_ynh/tree/testing).
+
+Untuk mencoba branch `testing`, silakan dilanjutkan seperti:
+
+```bash
+sudo yunohost app install https://github.com/YunoHost-Apps/influxdb_v2_ynh/tree/testing --debug
+atau
+sudo yunohost app upgrade influxdb_v2 -u https://github.com/YunoHost-Apps/influxdb_v2_ynh/tree/testing --debug
+```
+
+**Info lebih lanjut mengenai pemaketan aplikasi:** <https://yunohost.org/packaging_apps>
--- a/README_zh_Hans.md
+++ b/README_zh_Hans.md
@ -5,7 +5,7 @@

 # YunoHost 上的 InfluxDB v2

-[![集成程度](https://dash.yunohost.org/integration/influxdb_v2.svg)](https://dash.yunohost.org/appci/app/influxdb_v2) ![工作状态](https://ci-apps.yunohost.org/ci/badges/influxdb_v2.status.svg) ![维护状态](https://ci-apps.yunohost.org/ci/badges/influxdb_v2.maintain.svg)
+[![集成程度](https://dash.yunohost.org/integration/influxdb_v2.svg)](https://ci-apps.yunohost.org/ci/apps/influxdb_v2/) ![工作状态](https://ci-apps.yunohost.org/ci/badges/influxdb_v2.status.svg) ![维护状态](https://ci-apps.yunohost.org/ci/badges/influxdb_v2.maintain.svg)

 [![使用 YunoHost 安装 InfluxDB v2](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=influxdb_v2)

--- a/conf/nginx.conf
+++ b/conf/nginx.conf
@ -1,6 +1,7 @@
+#sub_path_only rewrite ^__PATH__$ __PATH__/ permanent;
 location __PATH__/ {

-  proxy_pass http://localhost:__PORT__/;
+  proxy_pass http://127.0.0.1:__PORT__/;

  # These configuration options are required for WebSockets to work.
  proxy_http_version 1.1;
--- a/conf/systemd.service
+++ b/conf/systemd.service
@ -1,5 +1,5 @@
 [Unit]
-Description=InfluxDB is an open-source, distributed, time series database
+Description=InfluxDB: distributed, time series database
 Documentation=https://docs.influxdata.com/influxdb/
 After=network-online.target

--- a/doc/ADMIN.md
+++ b/doc/ADMIN.md
@ -1 +0,0 @@
-The app install dir is `__INSTALL_DIR__`
--- a/doc/ADMIN_fr.md
+++ b/doc/ADMIN_fr.md
@ -1 +0,0 @@
-Le dossier d'install de l'app est `__INSTALL_DIR__`
--- a/manifest.toml
+++ b/manifest.toml
@ -2,7 +2,7 @@ packaging_format = 2

 id = "influxdb_v2"
 name = "InfluxDB v2"
-description.en = "Time-series database for storing, querying, and visualizing real-time data efficiently."
+description.en = "Time-series database for storing, querying, and visualizing real-time data efficiently"
 description.fr = "Base de données séries temporelles pour stocker, interroger et visualiser données temps réel efficacement"

 version = "2.7.1~ynh1"
--- a/scripts/backup
+++ b/scripts/backup
@ -27,23 +27,14 @@ ynh_backup --src_path="$install_dir"
 ynh_backup --src_path="$data_dir" --is_big

 #=================================================
-# BACKUP THE NGINX CONFIGURATION
+# SYSTEM CONFIGURATION
 #=================================================

 ynh_backup --src_path="/etc/nginx/conf.d/$domain.d/$app.conf"

-#=================================================
-# SPECIFIC BACKUP
-#=================================================
-# BACKUP LOGROTATE AND LOGS
-#=================================================
-
 ynh_backup --src_path="/etc/logrotate.d/$app"
-ynh_backup --src_path="/var/log/$app"

-#=================================================
-# BACKUP SYSTEMD
-#=================================================
+ynh_backup --src_path="/var/log/$app"

 ynh_backup --src_path="/etc/systemd/system/$app.service"

--- a/scripts/install
+++ b/scripts/install
@ -33,24 +33,7 @@ ynh_script_progression --message="Setting up source files..." --weight=1
 ynh_setup_source --dest_dir="$install_dir" --source_id=influxdb2
 ynh_setup_source --dest_dir="$install_dir" --source_id=influx

-chmod -R 750 "$install_dir"
-chown -R $app:$app "$install_dir"
-
-#=================================================
-# NGINX CONFIGURATION
-#=================================================
-ynh_script_progression --message="Configuring NGINX web server..." --weight=1
-
-# Create a dedicated NGINX config
-ynh_add_nginx_config
-
-#=================================================
-# CONFIGURE DATA DIRECTORY
-#=================================================
-ynh_script_progression --message="Setting permissions for the data directory..." --weight=1
-
-chmod -R 0750 "$data_dir"
-chown -R $app:$app "$data_dir"
+chown -R "$app:www-data" "$install_dir"

 #=================================================
 # ADD CONFIGURATION
@ -63,38 +46,33 @@ chmod 400 "$install_dir/config.toml"
 chown $app:$app "$install_dir/config.toml"

 #=================================================
-# CONFIGURE SYSTEMD
+# SYSTEM CONFIGURATION
 #=================================================
-ynh_script_progression --message="Configuring a systemd service..." --weight=1
+ynh_script_progression --message="Adding system configurations related to $app..." --weight=1
+
+# Create a dedicated NGINX config
+ynh_add_nginx_config

 # Create a dedicated systemd config
-ynh_add_systemd_config --service="$app" --template="systemd.service"
-
-#=================================================
-# INTEGRATE SERVICE IN YUNOHOST
-#=================================================
-ynh_script_progression --message="Integrating service in YunoHost..." --weight=1
+ynh_add_systemd_config --service="$app" --description="Time-series database" --template="systemd.service"

 yunohost service add "$app" --log="/var/log/$app/$app.log"

+ynh_use_logrotate
+
 #=================================================
 # START AND ENABLE SYSTEMD SERVICE
 #=================================================
 ynh_script_progression --message="Starting a systemd service..." --weight=1
+
 ynh_systemd_action --service_name=$app --action="enable"
 ynh_systemd_action --service_name=$app --action="start"

-#=================================================
-# SETUP LOGROTATE
-#=================================================
-
-ynh_script_progression --message="Configuring log rotation..." --weight=1
-ynh_use_logrotate
-
 #=================================================
 # APP INITIAL CONFIGURATION
 #=================================================
 ynh_script_progression --message="Configuring $app ..." --weight=30
+
 ynh_systemd_action --service_name=$app --action="start" --log_path="/var/log/$app/$app.log" --line_match="msg=Listening"

 # First setup InfluxDB v2 using influx
--- a/scripts/remove
+++ b/scripts/remove
@ -12,8 +12,6 @@ source /usr/share/yunohost/helpers
 #=================================================
 # REMOVE SYSTEM CONFIGURATIONS
 #=================================================
-# REMOVE SYSTEMD SERVICE 
-#=================================================
 ynh_script_progression --message="Removing system configurations related to $app..." --weight=1

 if ynh_exec_warn_less yunohost service status $app >/dev/null
@ -22,35 +20,12 @@ then
 	yunohost service remove $app
 fi

-#=================================================
-# STOP AND REMOVE SERVICE
-#=================================================
-ynh_script_progression --message="Stopping and removing the systemd service..." --weight=1
 ynh_remove_systemd_config

-#=================================================
-# REMOVE LOGROTATE CONFIGURATION
-#=================================================
-ynh_script_progression --message="Removing logrotate configuration..." --weight=1
 ynh_remove_logrotate

-#=================================================
-# REMOVE NGINX CONFIGURATION
-#=================================================
-ynh_script_progression --message="Removing NGINX web server configuration..." --weight=1
 ynh_remove_nginx_config

-
-#=================================================
-# SPECIFIC REMOVE
-#=================================================
-# REMOVE VARIOUS FILES
-#=================================================
-ynh_script_progression --message="Removing InfluxDB V2 data" --weight=1
-
-ynh_secure_remove --file="/var/log/$app"
-ynh_secure_remove --file="$data_dir"
-
 #=================================================
 # END OF SCRIPT
 #=================================================
--- a/scripts/restore
+++ b/scripts/restore
@ -16,8 +16,7 @@ ynh_script_progression --message="Restoring the app main directory..." --weight=

 ynh_restore_file --origin_path="$install_dir"

-chmod -R 750 "$install_dir"
-chown -R $app:$app "$install_dir"
+chown -R "$app:www-data" "$install_dir"

 #=================================================
 # RESTORE THE DATA DIRECTORY
@ -26,8 +25,7 @@ ynh_script_progression --message="Restoring the data directory..." --weight=1

 ynh_restore_file --origin_path="$data_dir" --not_mandatory

-chmod -R 0750 "$data_dir"
-chown -R $app:$app "$data_dir"
+chown -R "$app:www-data" "$data_dir"

 #=================================================
 # RESTORE SYSTEM CONFIGURATIONS
@ -35,15 +33,11 @@ chown -R $app:$app "$data_dir"
 ynh_script_progression --message="Restoring system configurations related to $app..." --weight=1

 ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf"
+
 ynh_restore_file --origin_path="/etc/systemd/system/$app.service"
 ynh_systemd_action --service_name=$app --action="enable"

-yunohost service add "$app" --log="/var/log/$app/$app.log"
-
-#=================================================
-# RESTORE THE LOGROTATE CONFIGURATION AND LOGS
-#=================================================
-ynh_script_progression --message="Restoring the logrotate configuration..." --weight=1
+yunohost service add "$app" --description="Time-series database" --log="/var/log/$app/$app.log"

 ynh_restore_file --origin_path="/var/log/$app"
 chown -R $app:$app "/var/log/$app"
--- a/scripts/upgrade
+++ b/scripts/upgrade
@ -9,16 +9,11 @@
 source _common.sh
 source /usr/share/yunohost/helpers

-upgrade_type=$(ynh_check_app_version_changed)
-
-#=================================================
-# STANDARD UPGRADE STEPS
-#=================================================
-
 #=================================================
 # STOP SYSTEMD SERVICE
 #=================================================
 ynh_script_progression --message="Stopping a systemd service..." --weight=1
+
 ynh_systemd_action --service_name=$app --action="stop" --log_path="/var/log/$app/$app.log"

 #=================================================
@ -26,33 +21,18 @@ ynh_systemd_action --service_name=$app --action="stop" --log_path="/var/log/$app
 #=================================================
 # DOWNLOAD, CHECK AND UNPACK SOURCE
 #=================================================
+ynh_script_progression --message="Upgrading source files..." --weight=1

-if [ "$upgrade_type" == "UPGRADE_APP" ]
-then
-	ynh_script_progression --message="Upgrading source files..." --weight=1
-
-	ynh_setup_source --dest_dir="$install_dir" --source_id=influxdb2 --keep=".influxdbv2/"
-	ynh_setup_source --dest_dir="$install_dir" --source_id=influx
-fi
+ynh_setup_source --dest_dir="$install_dir" --source_id=influxdb2 --keep=".influxdbv2/"
+ynh_setup_source --dest_dir="$install_dir" --source_id=influx

 chmod -R 750 "$install_dir"
 chown -R $app:$app "$install_dir"

 #=================================================
-# REAPPLY SYSTEM CONFIGURATIONS
+# UPDATE A CONFIG FILE
 #=================================================
-#=================================================
-# NGINX CONFIGURATION
-#=================================================
-ynh_script_progression --message="Configuring NGINX web server..." --weight=1
-
-# Create a dedicated NGINX config
-ynh_add_nginx_config
-
-#=================================================
-# ADD CONFIGURATION
-#=================================================
-ynh_script_progression --message="Adding $app configuration file..." --weight=1
+ynh_script_progression --message="Updating $app's configuration files..." --weight=1

 ynh_add_config --template="config.toml.example" --destination="$install_dir/config.toml"

@ -60,28 +40,20 @@ chmod 400 "$install_dir/config.toml"
 chown $app:$app "$install_dir/config.toml"

 #=================================================
-# CONFIGURE SYSTEMD
+# REAPPLY SYSTEM CONFIGURATIONS
 #=================================================
-ynh_script_progression --message="Configuring a systemd service..." --weight=1
-ynh_add_systemd_config --service="$app" --template="systemd.service"
+ynh_script_progression --message="Upgrading system configurations related to $app..." --weight=1

-#=================================================
-# INTEGRATE SERVICE IN YUNOHOST
-#=================================================
-ynh_script_progression --message="Integrating service in YunoHost..." --weight=1
-yunohost service add "$app" --log="/var/log/$app/$app.log"
+# Create a dedicated NGINX config
+ynh_add_nginx_config
+
+ynh_add_systemd_config
+
+yunohost service add "$app" --description="Time-series database" --log="/var/log/$app/$app.log"

-#=================================================
-# START AND ENABLE SYSTEMD SERVICE
-#=================================================
-ynh_script_progression --message="Starting a systemd service..." --weight=1
 ynh_systemd_action --service_name=$app --action="enable"
 ynh_systemd_action --service_name=$app --action="start"

-#=================================================
-# SETUP LOGROTATE
-#=================================================
-ynh_script_progression --message="Configuring log rotation..." --weight=1
 ynh_use_logrotate

 #=================================================
				`@ -1 +0,0 @@`
				Le dossier d'install de l'app est `__INSTALL_DIR__`