From fc1b501ca42003147b7b9038e38f6681000ff41a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Fri, 18 Aug 2023 14:24:14 +0200 Subject: [PATCH 1/3] Update manifest.toml --- manifest.toml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/manifest.toml b/manifest.toml index 6191dfb..c7bd3b3 100644 --- a/manifest.toml +++ b/manifest.toml @@ -16,7 +16,7 @@ admindoc = "https://www.metabase.com/docs/latest/" code = "https://github.com/metabase/metabase" [integration] -yunohost = ">= 11.1.19" +yunohost = ">= 11.2" architectures = "all" multi_instance = false ldap = false @@ -28,7 +28,6 @@ ram.runtime = "50M" [install] [install.domain] type = "domain" - full_domain = true [install.init_main_permission] help.en = "If enabled, Metabase will be accessible by people who do not have an account. This can be changed later via the webadmin." From 1e4785e70de011399846eb848bf9ff3d6ddffdf5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Fri, 18 Aug 2023 14:28:46 +0200 Subject: [PATCH 2/3] fix --- doc/DESCRIPTION_fr.md | 1 + manifest.toml | 6 +++--- scripts/install | 27 +++++---------------------- scripts/upgrade | 15 --------------- 4 files changed, 9 insertions(+), 40 deletions(-) create mode 100644 doc/DESCRIPTION_fr.md diff --git a/doc/DESCRIPTION_fr.md b/doc/DESCRIPTION_fr.md new file mode 100644 index 0000000..65a18ce --- /dev/null +++ b/doc/DESCRIPTION_fr.md @@ -0,0 +1 @@ +La métabase est le moyen facile et open source pour tous les membres de votre entreprise de poser des questions et d'apprendre à partir des données. \ No newline at end of file diff --git a/manifest.toml b/manifest.toml index c7bd3b3..4f44740 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "Metabase" description.en = "Web database management tool" description.fr = "Outil web de gestion des bases de données" -version = "0.44.6~ynh1" +version = "0.47.0~ynh1" maintainers = ["Colin Maudry"] @@ -37,8 +37,8 @@ ram.runtime = "50M" [resources] [resources.sources.main] - url = "https://downloads.metabase.com/v0.46.3/metabase.jar" - sha256 = "5988d34062484b664e89ba152d8949498b3d8d9a3c51f40ce2ac7938058cd164" + url = "https://downloads.metabase.com/v0.47.0/metabase.jar" + sha256 = "9bf03a464163971196bec306590041e8f571f24e1d5a34695363f0dea1eba809" extract = false rename = "metabase.jar" diff --git a/scripts/install b/scripts/install index 9d2d3a0..6ca58d3 100755 --- a/scripts/install +++ b/scripts/install @@ -29,13 +29,13 @@ ynh_script_progression --message="Configuring NGNX web server..." --weight=3 # Create a dedicated NGINX config ynh_add_nginx_config -#================================================= -# SETUP SYSTEMD -#================================================= -ynh_script_progression --message="Configuring a systemd service..." --weight=1 - ynh_add_systemd_config +# Use logrotate to manage application logfile(s) +ynh_use_logrotate + +yunohost service add $app --description="Web database management tool" --log="/var/log/$app/$app.log" + #================================================= # SETUP CONFIG #================================================= @@ -47,23 +47,6 @@ ynh_add_config --template="../conf/metabase" --destination="/etc/default/$app" chmod 640 "/etc/default/$app" chown $app "/etc/default/$app" -#================================================= -# GENERIC FINALIZATION -#================================================= -# SETUP LOGROTATE -#================================================= -ynh_script_progression --message="Configuring log rotation..." --weight=1 - -# Use logrotate to manage application logfile(s) -ynh_use_logrotate - -#================================================= -# INTEGRATE SERVICE IN YUNOHOST -#================================================= -ynh_script_progression --message="Integrating service in YunoHost..." --weight=3 - -yunohost service add $app --description="Web database management tool" --log="/var/log/$app/$app.log" - #================================================= # START SYSTEMD SERVICE #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index 0bd2168..8170768 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -48,26 +48,11 @@ ynh_script_progression --message="Upgrading NGINX web server configuration..." - # Create a dedicated NGINX config ynh_add_nginx_config -#================================================= -# SETUP SYSTEMD -#================================================= -ynh_script_progression --message="Configuring a systemd service..." --weight=3 - ynh_add_systemd_config -#================================================= -# HANDLE LOG FILES AND LOGROTATE -#================================================= -ynh_script_progression --message="Configuring log rotation..." --weight=3 - # Setup logrotate ynh_use_logrotate -#================================================= -# INTEGRATE SERVICE IN YUNOHOST -#================================================= -ynh_script_progression --message="Integrating service in YunoHost..." --weight=3 - yunohost service add $app --description="Web database management tool" --log="/var/log/$app/$app.log" #================================================= From a065dfa7a95643955b67358f5d24c04f203c7539 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Fri, 18 Aug 2023 12:28:51 +0000 Subject: [PATCH 3/3] Auto-update README --- README.md | 2 +- README_fr.md | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 8423a0b..d555464 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in Metabase is the easy, open-source way for everyone in your company to ask questions and learn from data. -**Shipped version:** 0.44.6~ynh1 +**Shipped version:** 0.47.0~ynh1 ## Screenshots diff --git a/README_fr.md b/README_fr.md index 6243dd1..f43a4ed 100644 --- a/README_fr.md +++ b/README_fr.md @@ -16,9 +16,9 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po ## Vue d’ensemble -Metabase is the easy, open-source way for everyone in your company to ask questions and learn from data. +La métabase est le moyen facile et open source pour tous les membres de votre entreprise de poser des questions et d'apprendre à partir des données. -**Version incluse :** 0.44.6~ynh1 +**Version incluse :** 0.47.0~ynh1 ## Captures d’écran