Merge pull request #8 from YunoHost-Apps/testing

ALL_README.md

@@ -1,6 +1,7 @@
 # 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)
+- [阅读中文（简体）的 README](README_zh_Hans.md)

README.md

@@ -9,7 +9,7 @@ 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)
 
-*[Read this README is other languages.](./ALL_README.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.*
@@ -33,7 +33,7 @@ Superset provides:
 *-- Superset's Github repository*
 
 
-**Shipped version:** 3.1.0~ynh1
+**Shipped version:** 4.0.0~ynh1
 
 ## Screenshots
 

README_eu.md

@@ -0,0 +1,62 @@
+<!--
+Ohart ongi: README hau automatikoki sortu da <https://github.com/YunoHost/apps/tree/master/tools/readme_generator>ri esker
+EZ editatu eskuz.
+-->
+
+# 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: <https://superset.apache.org/>
+- Administratzaileen dokumentazio ofiziala: <https://superset.apache.org/docs/intro>
+- Jatorrizko aplikazioaren kode-gordailua: <https://github.com/apache/superset>
+- YunoHost Denda: <https://apps.yunohost.org/app/superset>
+- Eman errore baten berri: <https://github.com/YunoHost-Apps/superset_ynh/issues>
+
+## 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:** <https://yunohost.org/packaging_apps>

README_fr.md

@@ -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
 

README_gl.md

@@ -33,7 +33,7 @@ Superset provides:
 *-- Superset's Github repository*
 
 
-**Versión proporcionada:** 3.1.0~ynh1
+**Versión proporcionada:** 4.0.0~ynh1
 
 ## Capturas de pantalla
 

README_zh_Hans.md

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

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;

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

manifest.toml

@@ -4,9 +4,9 @@ id = "superset"
 name = "Apache Superset"
 
 description.en = "Data exploration and visualization platform"
-description.fr = "Plateforme d'exploration et de visualisation de données"
+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"
+        url = "https://github.com/apache/superset/archive/refs/tags/4.0.0.tar.gz"
-        sha256 = "44747c9dd2aab96d5e1ba65559811785afe9139c3f9f85e55c8c4acc45e502df"
+        sha256 = "b1ac1c610c7893f36d10b05da419e54a582b851992cb98485501a35f6ab05e44"
         prefetch = false
         autoupdate.strategy = "latest_github_release"
 
@@ -59,14 +59,14 @@ ram.runtime = "500M"
 
     [resources.permissions]
     main.url = "/"
-    admin.url = "/"
+    admin.show_tile = false
-    alpha.url = "/"
+    alpha.show_tile = false
-    gamma.url = "/"
+    gamma.show_tile = false
 
     [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"

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

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
@@ -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
@@ -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"

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