From d4851fcbb78246bbee21482575ee9509a0bb351f Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Tue, 9 Apr 2024 03:44:31 +0200 Subject: [PATCH 01/10] Upgrade to v4.0.0 https://github.com/apache/superset/releases/tag/4.0.0 --- manifest.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/manifest.toml b/manifest.toml index ec10ea2..e376890 100644 --- a/manifest.toml +++ b/manifest.toml @@ -6,7 +6,7 @@ name = "Apache Superset" description.en = "Data exploration and visualization platform" description.fr = "Plateforme d'exploration et de visualisation de données" -version = "3.1.0~ynh1" +version = "4.0.0~ynh1" maintainers = ["tituspijean"] @@ -48,8 +48,8 @@ ram.runtime = "500M" [resources.sources] [resources.sources.main] - url = "https://github.com/apache/superset/archive/refs/tags/3.1.0.tar.gz" - sha256 = "44747c9dd2aab96d5e1ba65559811785afe9139c3f9f85e55c8c4acc45e502df" + url = "https://github.com/apache/superset/archive/refs/tags/4.0.0.tar.gz" + sha256 = "b1ac1c610c7893f36d10b05da419e54a582b851992cb98485501a35f6ab05e44" prefetch = false autoupdate.strategy = "latest_github_release" From f00d4168fe5f4ce5b56df0cda75e78b1bb88f445 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Tue, 9 Apr 2024 01:44:34 +0000 Subject: [PATCH 02/10] Auto-update READMEs --- ALL_README.md | 6 +++++ README.md | 28 +++++++++++------------ README_eu.md | 62 +++++++++++++++++++++++++++++++++++++++++++++++++++ README_fr.md | 30 ++++++++++++------------- README_gl.md | 62 +++++++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 159 insertions(+), 29 deletions(-) create mode 100644 ALL_README.md create mode 100644 README_eu.md create mode 100644 README_gl.md diff --git a/ALL_README.md b/ALL_README.md new file mode 100644 index 0000000..77b7509 --- /dev/null +++ b/ALL_README.md @@ -0,0 +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) diff --git a/README.md b/README.md index ea1bddb..e1140e9 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ @@ -9,10 +9,10 @@ It shall NOT be edited by hand. [![Install Apache Superset with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=superset) -*[Lire ce readme en français.](./README_fr.md)* +*[Read this README in other languages.](./ALL_README.md)* -> *This package allows you to install Apache Superset 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.* +> *This package allows you to install Apache Superset 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.* ## Overview @@ -33,7 +33,7 @@ Superset provides: *-- Superset's Github repository* -**Shipped version:** 3.1.0~ynh1 +**Shipped version:** 4.0.0~ynh1 ## Screenshots @@ -41,22 +41,22 @@ Superset provides: ## Documentation and resources -* Official app website: -* Official admin documentation: -* Upstream app code repository: -* YunoHost Store: -* Report a bug: +- Official app website: +- Official admin documentation: +- Upstream app code repository: +- YunoHost Store: +- Report a bug: ## Developer info -Please send your pull request to the [testing branch](https://github.com/YunoHost-Apps/superset_ynh/tree/testing). +Please send your pull request to the [`testing` branch](https://github.com/YunoHost-Apps/superset_ynh/tree/testing). -To try the testing branch, please proceed like that. +To try the `testing` branch, please proceed like that: -``` bash +```bash sudo yunohost app install https://github.com/YunoHost-Apps/superset_ynh/tree/testing --debug or sudo yunohost app upgrade superset -u https://github.com/YunoHost-Apps/superset_ynh/tree/testing --debug ``` -**More info regarding app packaging:** \ No newline at end of file +**More info regarding app packaging:** diff --git a/README_eu.md b/README_eu.md new file mode 100644 index 0000000..01fdde0 --- /dev/null +++ b/README_eu.md @@ -0,0 +1,62 @@ + + +# Apache Superset YunoHost-erako + +[![Integrazio maila](https://dash.yunohost.org/integration/superset.svg)](https://dash.yunohost.org/appci/app/superset) ![Funtzionamendu egoera](https://ci-apps.yunohost.org/ci/badges/superset.status.svg) ![Mantentze egoera](https://ci-apps.yunohost.org/ci/badges/superset.maintain.svg) + +[![Instalatu Apache Superset YunoHost-ekin](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=superset) + +*[Irakurri README hau beste hizkuntzatan.](./ALL_README.md)* + +> *Pakete honek Apache Superset YunoHost zerbitzari batean azkar eta zailtasunik gabe instalatzea ahalbidetzen dizu.* +> *YunoHost ez baduzu, kontsultatu [gida](https://yunohost.org/install) nola instalatu ikasteko.* + +## Aurreikuspena + +Superset is a modern data exploration and data visualization platform. Superset can replace or augment proprietary business intelligence tools for many teams. Superset integrates well with a variety of data sources. + +Superset provides: + +- A no-code interface for building charts quickly +- A powerful, web-based SQL Editor for advanced querying +- A lightweight semantic layer for quickly defining custom dimensions and metrics +- Out of the box support for nearly any SQL database or data engine +- A wide array of beautiful visualizations to showcase your data, ranging from simple bar charts to geospatial visualizations +- Lightweight, configurable caching layer to help ease database load +- Highly extensible security roles and authentication options +- An API for programmatic customization +- A cloud-native architecture designed from the ground up for scale + +*-- Superset's Github repository* + + +**Paketatutako bertsioa:** 4.0.0~ynh1 + +## Pantaila-argazkiak + +![Apache Superset(r)en pantaila-argazkia](./doc/screenshots/explore.jpg) + +## 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/superset_ynh/tree/testing). + +`testing` abarra probatzeko, ondorengoa egin: + +```bash +sudo yunohost app install https://github.com/YunoHost-Apps/superset_ynh/tree/testing --debug +edo +sudo yunohost app upgrade superset -u https://github.com/YunoHost-Apps/superset_ynh/tree/testing --debug +``` + +**Informazio gehiago aplikazioaren paketatzeari buruz:** diff --git a/README_fr.md b/README_fr.md index c1501ff..89de3ff 100644 --- a/README_fr.md +++ b/README_fr.md @@ -1,6 +1,6 @@ # Apache Superset pour YunoHost @@ -9,10 +9,10 @@ It shall NOT be edited by hand. [![Installer Apache Superset avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=superset) -*[Read this readme in english.](./README.md)* +*[Lire le README dans d'autres langues.](./ALL_README.md)* -> *Ce package vous permet d’installer Apache Superset rapidement et simplement sur un serveur YunoHost. -Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour savoir comment l’installer et en profiter.* +> *Ce package vous permet d’installer Apache Superset rapidement et simplement sur un serveur YunoHost.* +> *Si vous n’avez pas YunoHost, consultez [ce guide](https://yunohost.org/install) pour savoir comment l’installer et en profiter.* ## Vue d’ensemble @@ -33,7 +33,7 @@ Superset provides: *-- Superset's Github repository* -**Version incluse :** 3.1.0~ynh1 +**Version incluse :** 4.0.0~ynh1 ## Captures d’écran @@ -41,22 +41,22 @@ Superset provides: ## Documentations et ressources -* Site officiel de l’app : -* Documentation officielle de l’admin : -* Dépôt de code officiel de l’app : -* YunoHost Store: -* Signaler un bug : +- Site officiel de l’app : +- Documentation officielle de l’admin : +- Dépôt de code officiel de l’app : +- YunoHost Store : +- Signaler un bug : ## Informations pour les développeurs -Merci de faire vos pull request sur la [branche testing](https://github.com/YunoHost-Apps/superset_ynh/tree/testing). +Merci de faire vos pull request sur la [branche `testing`](https://github.com/YunoHost-Apps/superset_ynh/tree/testing). -Pour essayer la branche testing, procédez comme suit. +Pour essayer la branche `testing`, procédez comme suit : -``` bash +```bash sudo yunohost app install https://github.com/YunoHost-Apps/superset_ynh/tree/testing --debug ou sudo yunohost app upgrade superset -u https://github.com/YunoHost-Apps/superset_ynh/tree/testing --debug ``` -**Plus d’infos sur le packaging d’applications :** \ No newline at end of file +**Plus d’infos sur le packaging d’applications :** diff --git a/README_gl.md b/README_gl.md new file mode 100644 index 0000000..b4fd443 --- /dev/null +++ b/README_gl.md @@ -0,0 +1,62 @@ + + +# Apache Superset para YunoHost + +[![Nivel de integración](https://dash.yunohost.org/integration/superset.svg)](https://dash.yunohost.org/appci/app/superset) ![Estado de funcionamento](https://ci-apps.yunohost.org/ci/badges/superset.status.svg) ![Estado de mantemento](https://ci-apps.yunohost.org/ci/badges/superset.maintain.svg) + +[![Instalar Apache Superset con YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=superset) + +*[Le este README en outros idiomas.](./ALL_README.md)* + +> *Este paquete permíteche instalar Apache Superset de xeito rápido e doado nun servidor YunoHost.* +> *Se non usas YunoHost, le a [documentación](https://yunohost.org/install) para saber como instalalo.* + +## Vista xeral + +Superset is a modern data exploration and data visualization platform. Superset can replace or augment proprietary business intelligence tools for many teams. Superset integrates well with a variety of data sources. + +Superset provides: + +- A no-code interface for building charts quickly +- A powerful, web-based SQL Editor for advanced querying +- A lightweight semantic layer for quickly defining custom dimensions and metrics +- Out of the box support for nearly any SQL database or data engine +- A wide array of beautiful visualizations to showcase your data, ranging from simple bar charts to geospatial visualizations +- Lightweight, configurable caching layer to help ease database load +- Highly extensible security roles and authentication options +- An API for programmatic customization +- A cloud-native architecture designed from the ground up for scale + +*-- Superset's Github repository* + + +**Versión proporcionada:** 4.0.0~ynh1 + +## Capturas de pantalla + +![Captura de pantalla de Apache Superset](./doc/screenshots/explore.jpg) + +## Documentación e recursos + +- Web oficial da app: +- Documentación oficial para admin: +- Repositorio de orixe do código: +- Tenda YunoHost: +- Informar dun problema: + +## Info de desenvolvemento + +Envía a túa colaboración á [rama `testing`](https://github.com/YunoHost-Apps/superset_ynh/tree/testing). + +Para probar a rama `testing`, procede deste xeito: + +```bash +sudo yunohost app install https://github.com/YunoHost-Apps/superset_ynh/tree/testing --debug +ou +sudo yunohost app upgrade superset -u https://github.com/YunoHost-Apps/superset_ynh/tree/testing --debug +``` + +**Máis info sobre o empaquetado da app:** From ae6a949f1b5478c769d3525871b1c5c59b5ca877 Mon Sep 17 00:00:00 2001 From: tituspijean Date: Thu, 2 May 2024 23:06:58 +0200 Subject: [PATCH 03/10] Use generic python3 calls --- scripts/install | 2 +- scripts/upgrade | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/install b/scripts/install index 432ec84..ae91bba 100644 --- a/scripts/install +++ b/scripts/install @@ -29,7 +29,7 @@ chown $app:$app "$install_dir/superset_config.py" ynh_script_progression --message="Installing app..." --weight=5 # Prepare environment -python3.9 -m venv $install_dir/venv +python3 -m venv $install_dir/venv localpath=$install_dir/venv/bin:$PATH environment="FLASK_APP=superset SUPERSET_CONFIG_PATH=$install_dir/superset_config.py SUPERSET_SECRET_KEY=$secret_key" export $environment diff --git a/scripts/upgrade b/scripts/upgrade index 67ab6cf..9389471 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -42,7 +42,7 @@ chown $app:$app "$install_dir/superset_config.py" ynh_script_progression --message="Upgrading app..." --weight=5 # Prepare environment -python3.9 -m venv --upgrade $install_dir/venv +python3 -m venv --upgrade $install_dir/venv localpath=$install_dir/venv/bin:$PATH environment="FLASK_APP=superset SUPERSET_CONFIG_PATH=$install_dir/superset_config.py SUPERSET_SECRET_KEY=$secret_key" export $environment From 9ef918a468a57069a81c5942d238dbd0d7ef389f Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Thu, 2 May 2024 21:07:41 +0000 Subject: [PATCH 04/10] Auto-update READMEs --- ALL_README.md | 1 + README_zh_Hans.md | 62 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 63 insertions(+) create mode 100644 README_zh_Hans.md diff --git a/ALL_README.md b/ALL_README.md index 77b7509..a01b345 100644 --- a/ALL_README.md +++ b/ALL_README.md @@ -4,3 +4,4 @@ - [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_zh_Hans.md b/README_zh_Hans.md new file mode 100644 index 0000000..2d66e64 --- /dev/null +++ b/README_zh_Hans.md @@ -0,0 +1,62 @@ + + +# YunoHost 的 Apache Superset + +[![集成程度](https://dash.yunohost.org/integration/superset.svg)](https://dash.yunohost.org/appci/app/superset) ![工作状态](https://ci-apps.yunohost.org/ci/badges/superset.status.svg) ![维护状态](https://ci-apps.yunohost.org/ci/badges/superset.maintain.svg) + +[![使用 YunoHost 安装 Apache Superset](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=superset) + +*[阅读此 README 的其它语言版本。](./ALL_README.md)* + +> *通过此软件包，您可以在 YunoHost 服务器上快速、简单地安装 Apache Superset。* +> *如果您还没有 YunoHost，请参阅[指南](https://yunohost.org/install)了解如何安装它。* + +## 概况 + +Superset is a modern data exploration and data visualization platform. Superset can replace or augment proprietary business intelligence tools for many teams. Superset integrates well with a variety of data sources. + +Superset provides: + +- A no-code interface for building charts quickly +- A powerful, web-based SQL Editor for advanced querying +- A lightweight semantic layer for quickly defining custom dimensions and metrics +- Out of the box support for nearly any SQL database or data engine +- A wide array of beautiful visualizations to showcase your data, ranging from simple bar charts to geospatial visualizations +- Lightweight, configurable caching layer to help ease database load +- Highly extensible security roles and authentication options +- An API for programmatic customization +- A cloud-native architecture designed from the ground up for scale + +*-- Superset's Github repository* + + +**分发版本：** 4.0.0~ynh1 + +## 截图 + +![Apache Superset 的截图](./doc/screenshots/explore.jpg) + +## 文档与资源 + +- 官方应用网站： +- 官方管理文档： +- 上游应用代码库： +- YunoHost 商店： +- 报告 bug： + +## 开发者信息 + +请向 [`testing` 分支](https://github.com/YunoHost-Apps/superset_ynh/tree/testing) 发送拉取请求。 + +如要尝试 `testing` 分支，请这样操作： + +```bash +sudo yunohost app install https://github.com/YunoHost-Apps/superset_ynh/tree/testing --debug +或 +sudo yunohost app upgrade superset -u https://github.com/YunoHost-Apps/superset_ynh/tree/testing --debug +``` + +**有关应用打包的更多信息：** From 3f66af3e7f3528fb1ab5ab97b2492870e600fb80 Mon Sep 17 00:00:00 2001 From: tituspijean Date: Thu, 2 May 2024 23:15:22 +0200 Subject: [PATCH 05/10] Add g++ dependency --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index e376890..4a9ef11 100644 --- a/manifest.toml +++ b/manifest.toml @@ -66,7 +66,7 @@ ram.runtime = "500M" [resources.ports] [resources.apt] - packages = "python3-dev libpq-dev postgresql python3 python3-venv libldap2-dev libsasl2-dev libssl-dev" + packages = "g++ libpq-dev postgresql python3 python3-dev python3-venv libldap2-dev libsasl2-dev libssl-dev" [resources.database] type = "postgresql" From efe7e7d551e6862d36805b81075fd86cf5e44281 Mon Sep 17 00:00:00 2001 From: tituspijean Date: Thu, 2 May 2024 23:40:14 +0200 Subject: [PATCH 06/10] Fix restore userdb --- scripts/restore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/restore b/scripts/restore index 8bbd84d..4485c5a 100644 --- a/scripts/restore +++ b/scripts/restore @@ -28,7 +28,7 @@ ynh_psql_connect_as --user=$db_user --password=$db_pwd --database=$db_name < ./a ynh_psql_create_user "$userdata_db_user" "$userdata_db_pwd" ynh_psql_create_db "$userdata_db_name" "$userdata_db_user" -ynh_psql_connect_as --user=$userdata_db_user --password=$userdata_db_pwd --database=$userdata_db_name < ./userb.sql +ynh_psql_connect_as --user=$userdata_db_user --password=$userdata_db_pwd --database=$userdata_db_name < ./userdb.sql #================================================= # RESTORE SYSTEM CONFIGURATIONS From bc18e9ac469ad3f94726be31db21d3c452360bf7 Mon Sep 17 00:00:00 2001 From: tituspijean Date: Sat, 4 May 2024 22:44:28 +0200 Subject: [PATCH 07/10] Avoid multiple permissions sharing the same path --- manifest.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/manifest.toml b/manifest.toml index 4a9ef11..60de13e 100644 --- a/manifest.toml +++ b/manifest.toml @@ -59,9 +59,9 @@ ram.runtime = "500M" [resources.permissions] main.url = "/" - admin.url = "/" - alpha.url = "/" - gamma.url = "/" + admin.show_tile = false + alpha.show_tile = false + gamma.show_tile = false [resources.ports] From a452348da8482ee56d61c36f5efa164ede062b58 Mon Sep 17 00:00:00 2001 From: tituspijean Date: Sat, 4 May 2024 23:24:42 +0200 Subject: [PATCH 08/10] Correctly use the proxy headers --- conf/nginx.conf | 2 +- conf/superset_config.py | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/conf/nginx.conf b/conf/nginx.conf index 6407144..bdef812 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -7,7 +7,7 @@ location __PATH__/ { proxy_set_header Connection "Upgrade"; # preserve client IP - proxy_set_header X-Forwarded-For $remote_addr; + proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; client_max_body_size 50M; diff --git a/conf/superset_config.py b/conf/superset_config.py index 91fa8fc..36f1489 100644 --- a/conf/superset_config.py +++ b/conf/superset_config.py @@ -21,3 +21,5 @@ AUTH_ROLES_MAPPING = { "cn=__APP__.admin,ou=permission,dc=yunohost,dc=org": ["Admin"], } AUTH_ROLES_SYNC_AT_LOGIN = True + +ENABLE_PROXY_FIX = True From bdfc8fede0e0e557c44f338a61a5f86e60f0fd15 Mon Sep 17 00:00:00 2001 From: tituspijean Date: Sat, 4 May 2024 23:35:16 +0200 Subject: [PATCH 09/10] Fix restored install_dir permissions --- scripts/restore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/restore b/scripts/restore index 4485c5a..f16e5a3 100644 --- a/scripts/restore +++ b/scripts/restore @@ -16,7 +16,7 @@ ynh_script_progression --message="Restoring the app main directory..." --weight= ynh_restore_file --origin_path="$install_dir" -chown -R $app:www-data "$install_dir" +chown -R $app:$app "$install_dir" #================================================= # RESTORE THE MYSQL DATABASE From 0d5d0d47ea4a0455374e5cb681ecddcdf4c939d7 Mon Sep 17 00:00:00 2001 From: tituspijean Date: Sat, 4 May 2024 23:46:22 +0200 Subject: [PATCH 10/10] Fix restore: make sure log directory exists --- scripts/restore | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/restore b/scripts/restore index f16e5a3..dc7b9bc 100644 --- a/scripts/restore +++ b/scripts/restore @@ -40,6 +40,7 @@ ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf" ynh_restore_file --origin_path="/etc/systemd/system/$app.service" systemctl enable $app.service --quiet +mkdir -p "/var/log/$app" yunohost service add $app --log="/var/log/$app/$app.log" ynh_restore_file --origin_path="/etc/logrotate.d/$app"