From feedea1c307eaa505928d71a44c725bac3292870 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Tue, 13 Aug 2024 03:35:04 +0200 Subject: [PATCH 1/9] Upgrade sources - `main` v1.1.17: https://github.com/gristlabs/grist-core/releases/tag/v1.1.17 --- manifest.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/manifest.toml b/manifest.toml index d64b228..5078aa2 100644 --- a/manifest.toml +++ b/manifest.toml @@ -7,7 +7,7 @@ name = "Grist" description.en = "Modern relational spreadsheet" description.fr = "Feuille de calcul relationnelle moderne" -version = "1.1.16~ynh1" +version = "1.1.17~ynh1" maintainers = ["fflorent"] @@ -56,8 +56,8 @@ ram.runtime = "150M" [resources.sources] [resources.sources.main] - url = "https://github.com/gristlabs/grist-core/archive/refs/tags/v1.1.16.tar.gz" - sha256 = "6f12ada699f5f14e587b677b6b43adde86c09698718b59332f975e8eddb44ed7" + url = "https://github.com/gristlabs/grist-core/archive/refs/tags/v1.1.17.tar.gz" + sha256 = "14049bc7cd2ced153fb7c5e547018ae597d7a4010f96e0c7583a0d2e953e0dc0" autoupdate.strategy = "latest_github_release" From 588c4e38ff223379a601e64a9c47ddd38f319047 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Tue, 13 Aug 2024 01:35:05 +0000 Subject: [PATCH 2/9] Auto-update READMEs --- ALL_README.md | 1 + README.md | 2 +- README_es.md | 2 +- README_eu.md | 2 +- README_fr.md | 2 +- README_gl.md | 2 +- README_id.md | 64 +++++++++++++++++++++++++++++++++++++++++++++++ README_zh_Hans.md | 2 +- 8 files changed, 71 insertions(+), 6 deletions(-) create mode 100644 README_id.md diff --git a/ALL_README.md b/ALL_README.md index 152f2e7..4ed64dd 100644 --- 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) diff --git a/README.md b/README.md index c1942a4..6daf222 100644 --- a/README.md +++ b/README.md @@ -32,7 +32,7 @@ More about the features can be found here: diff --git a/README_es.md b/README_es.md index 6ec417b..238b825 100644 --- a/README_es.md +++ b/README_es.md @@ -32,7 +32,7 @@ More about the features can be found here: diff --git a/README_eu.md b/README_eu.md index 9a86278..664a8e5 100644 --- a/README_eu.md +++ b/README_eu.md @@ -32,7 +32,7 @@ More about the features can be found here: diff --git a/README_fr.md b/README_fr.md index e18605a..8e11192 100644 --- a/README_fr.md +++ b/README_fr.md @@ -32,7 +32,7 @@ Plus d'information sur les fonctionnalités sont disponibles ici : diff --git a/README_gl.md b/README_gl.md index 552a913..d1890e2 100644 --- a/README_gl.md +++ b/README_gl.md @@ -32,7 +32,7 @@ More about the features can be found here: diff --git a/README_id.md b/README_id.md new file mode 100644 index 0000000..3c4c506 --- /dev/null +++ b/README_id.md @@ -0,0 +1,64 @@ + + +# Grist untuk YunoHost + +[![Tingkat integrasi](https://dash.yunohost.org/integration/grist.svg)](https://ci-apps.yunohost.org/ci/apps/grist/) ![Status kerja](https://ci-apps.yunohost.org/ci/badges/grist.status.svg) ![Status pemeliharaan](https://ci-apps.yunohost.org/ci/badges/grist.maintain.svg) + +[![Pasang Grist dengan YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=grist) + +*[Baca README ini dengan bahasa yang lain.](./ALL_README.md)* + +> *Paket ini memperbolehkan Anda untuk memasang Grist 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 + +Grist is a modern relational spreadsheet. It combines the flexibility of a spreadsheet with the robustness of a database to organize your data and make you more productive. + +### Features + +Grist is a hybrid database/spreadsheet, meaning that: + +- Columns work like they do in databases: they are named, and they hold one kind of data. +- Columns can be filled by formula, spreadsheet-style, with automatic updates when referenced cells change. + +More about the features can be found here: + +### Limitations + +- You cannot log out from Grist, you have to log out from YunoHost to do that. + + +**Versi terkirim:** 1.1.17~ynh1 + +**Demo:** + +## Tangkapan Layar + +![Tangkapan Layar pada Grist](./doc/screenshots/grist.jpg) + +## Dokumentasi dan sumber daya + +- Website aplikasi resmi: +- Dokumentasi pengguna resmi: +- Dokumentasi admin resmi: +- Depot kode aplikasi hulu: +- Gudang YunoHost: +- Laporkan bug: + +## Info developer + +Silakan kirim pull request ke [`testing` branch](https://github.com/YunoHost-Apps/grist_ynh/tree/testing). + +Untuk mencoba branch `testing`, silakan dilanjutkan seperti: + +```bash +sudo yunohost app install https://github.com/YunoHost-Apps/grist_ynh/tree/testing --debug +atau +sudo yunohost app upgrade grist -u https://github.com/YunoHost-Apps/grist_ynh/tree/testing --debug +``` + +**Info lebih lanjut mengenai pemaketan aplikasi:** diff --git a/README_zh_Hans.md b/README_zh_Hans.md index 064a69a..0174f73 100644 --- a/README_zh_Hans.md +++ b/README_zh_Hans.md @@ -32,7 +32,7 @@ More about the features can be found here: From 7fec378df213d1e47d173c20ba803fcac79516bb Mon Sep 17 00:00:00 2001 From: Florent Date: Mon, 27 May 2024 10:58:53 +0200 Subject: [PATCH 3/9] Revert "Use APP_HOME_INTERNAL_URL for features like copying documents" This reverts commit 309d97f9217712f52ea1d0c3fe04a6cc06a8e838. --- conf/default.env | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/conf/default.env b/conf/default.env index a57a4a0..d87e16c 100644 --- a/conf/default.env +++ b/conf/default.env @@ -1,7 +1,6 @@ # This file is not meant to be edited. # Please place your environment variables in __DATA_DIR__/custom.env file APP_HOME_URL=https://__DOMAIN__ -APP_HOME_INTERNAL_URL=http://localhost:__PORT__ GRIST_ORG_IN_PATH=true GRIST_SANDBOX_FLAVOR=pyodide GRIST_HIDE_UI_ELEMENTS=billing,sendToDrive @@ -16,5 +15,5 @@ PORT=__PORT__ GRIST_FORWARD_AUTH_HEADER=Email GRIST_IGNORE_SESSION=0 # SSOWat Removes the authentication headers: https://github.com/YunoHost/SSOwat/blob/38a6f23f3805a098b4ab757ff002f3a5fb3c377a/helpers.lua#L422-L425 -# Widget iist + GRIST_WIDGET_LIST_URL=https://github.com/gristlabs/grist-widget/releases/download/latest/manifest.json From 6fdfe6850ac28936aefc864da4ec4b6d27112f78 Mon Sep 17 00:00:00 2001 From: Florent Date: Mon, 27 May 2024 11:01:24 +0200 Subject: [PATCH 4/9] Preserve custom.env accross upgrades --- scripts/upgrade | 4 ---- 1 file changed, 4 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index 53df1f7..d1629f2 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -83,14 +83,10 @@ ynh_use_logrotate --non-append ynh_script_progression --message="Updating a configuration file..." --weight=1 ynh_add_config --template="default.env" --destination="$install_dir/default.env" -ynh_add_config --template="custom.env" --destination="$data_dir/custom.env" chmod 400 "$install_dir/default.env" chown $app:$app "$install_dir/default.env" -chmod 700 "$data_dir/custom.env" -chown $app:$app "$data_dir/custom.env" - #================================================= # START SYSTEMD SERVICE #================================================= From 1c014c40a3027efdef8fb623f371574df96fced4 Mon Sep 17 00:00:00 2001 From: Florent Date: Tue, 13 Aug 2024 08:03:00 +0200 Subject: [PATCH 5/9] Add GRIST_DEFAULT_EMAIL for setting admin email --- conf/default.env | 1 + scripts/change_url | 1 + scripts/install | 1 + scripts/upgrade | 1 + 4 files changed, 4 insertions(+) diff --git a/conf/default.env b/conf/default.env index d87e16c..611ac40 100644 --- a/conf/default.env +++ b/conf/default.env @@ -10,6 +10,7 @@ REDIS_URL=redis://localhost:6379/__REDIS_DB__ GRIST_DATA_DIR=__DATA_DIR__/docs/ TYPEORM_DATABASE=__DATA_DIR__/home.db PORT=__PORT__ +GRIST_DEFAULT_EMAIL=__ADMIN_EMAIL__ # Authentication GRIST_FORWARD_AUTH_HEADER=Email diff --git a/scripts/change_url b/scripts/change_url index 16e8c95..6096804 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -32,6 +32,7 @@ ynh_script_progression --message="Updating env configuration file..." --weight=1 domain="$new_domain" path="$new_path" +admin_email=$(ynh_user_get_info --username=$admin --key=mail) ynh_add_config --template="default.env" --destination="$install_dir/default.env" #================================================= diff --git a/scripts/install b/scripts/install index 3433d51..73eee63 100755 --- a/scripts/install +++ b/scripts/install @@ -71,6 +71,7 @@ ynh_app_setting_set --app="$app" --key=redis_db --value="$redis_db" #================================================= ynh_script_progression --message="Adding a configuration file..." --weight=1 +admin_email=$(ynh_user_get_info --username=$admin --key=mail) ynh_add_config --template="default.env" --destination="$install_dir/default.env" ynh_add_config --template="custom.env" --destination="$data_dir/custom.env" diff --git a/scripts/upgrade b/scripts/upgrade index d1629f2..0fcbbda 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -82,6 +82,7 @@ ynh_use_logrotate --non-append #================================================= ynh_script_progression --message="Updating a configuration file..." --weight=1 +admin_email=$(ynh_user_get_info --username=$admin --key=mail) ynh_add_config --template="default.env" --destination="$install_dir/default.env" chmod 400 "$install_dir/default.env" From 603f89cd2723e3be4cde2a9235dda2b6f8812a99 Mon Sep 17 00:00:00 2001 From: Florent Date: Tue, 13 Aug 2024 08:03:41 +0200 Subject: [PATCH 6/9] Bump version --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index 5078aa2..f91cb64 100644 --- a/manifest.toml +++ b/manifest.toml @@ -7,7 +7,7 @@ name = "Grist" description.en = "Modern relational spreadsheet" description.fr = "Feuille de calcul relationnelle moderne" -version = "1.1.17~ynh1" +version = "1.1.17~ynh2" maintainers = ["fflorent"] From efa8fa804c3e80fd6e25afc567f23543f673fb54 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Tue, 13 Aug 2024 06:04:02 +0000 Subject: [PATCH 7/9] Auto-update READMEs --- README.md | 2 +- README_es.md | 2 +- README_eu.md | 2 +- README_fr.md | 2 +- README_gl.md | 2 +- README_id.md | 2 +- README_zh_Hans.md | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 6daf222..3334ec4 100644 --- a/README.md +++ b/README.md @@ -32,7 +32,7 @@ More about the features can be found here: diff --git a/README_es.md b/README_es.md index 238b825..55316d0 100644 --- a/README_es.md +++ b/README_es.md @@ -32,7 +32,7 @@ More about the features can be found here: diff --git a/README_eu.md b/README_eu.md index 664a8e5..038e474 100644 --- a/README_eu.md +++ b/README_eu.md @@ -32,7 +32,7 @@ More about the features can be found here: diff --git a/README_fr.md b/README_fr.md index 8e11192..88e27f0 100644 --- a/README_fr.md +++ b/README_fr.md @@ -32,7 +32,7 @@ Plus d'information sur les fonctionnalités sont disponibles ici : diff --git a/README_gl.md b/README_gl.md index d1890e2..f83f651 100644 --- a/README_gl.md +++ b/README_gl.md @@ -32,7 +32,7 @@ More about the features can be found here: diff --git a/README_id.md b/README_id.md index 3c4c506..e5a40d5 100644 --- a/README_id.md +++ b/README_id.md @@ -32,7 +32,7 @@ More about the features can be found here: diff --git a/README_zh_Hans.md b/README_zh_Hans.md index 0174f73..ecc2eff 100644 --- a/README_zh_Hans.md +++ b/README_zh_Hans.md @@ -32,7 +32,7 @@ More about the features can be found here: From 20bff16b60c0ee96f1ec71ef514d758f5492882e Mon Sep 17 00:00:00 2001 From: Florent Date: Tue, 13 Aug 2024 08:25:09 +0200 Subject: [PATCH 8/9] Add session secret --- conf/default.env | 1 + scripts/change_url | 2 ++ scripts/install | 8 ++++++++ scripts/upgrade | 11 ++++++++++- 4 files changed, 21 insertions(+), 1 deletion(-) diff --git a/conf/default.env b/conf/default.env index 611ac40..1c3442e 100644 --- a/conf/default.env +++ b/conf/default.env @@ -11,6 +11,7 @@ GRIST_DATA_DIR=__DATA_DIR__/docs/ TYPEORM_DATABASE=__DATA_DIR__/home.db PORT=__PORT__ GRIST_DEFAULT_EMAIL=__ADMIN_EMAIL__ +GRIST_SESSION_SECRET=__SESSION_SECRET__ # Authentication GRIST_FORWARD_AUTH_HEADER=Email diff --git a/scripts/change_url b/scripts/change_url index 6096804..687c182 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -33,6 +33,8 @@ ynh_script_progression --message="Updating env configuration file..." --weight=1 domain="$new_domain" path="$new_path" admin_email=$(ynh_user_get_info --username=$admin --key=mail) +redis_db=$(ynh_app_setting_get --app=$app --key=redis_db) +session_secret=$(ynh_app_setting_get --app=$app --key=session_secret) ynh_add_config --template="default.env" --destination="$install_dir/default.env" #================================================= diff --git a/scripts/install b/scripts/install index 73eee63..625465c 100755 --- a/scripts/install +++ b/scripts/install @@ -9,6 +9,14 @@ source _common.sh source /usr/share/yunohost/helpers + +#================================================= +# INITIALIZE AND STORE SETTINGS +#================================================= + +session_secret=$(ynh_string_random --length=32) +ynh_app_setting_set --app=$app --key=session_secret --value=$session_secret + #================================================= # APP "BUILD" (DEPLOYING SOURCES, VENV, COMPILING ETC) #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index 0fcbbda..6113c1c 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -12,7 +12,7 @@ source _common.sh source /usr/share/yunohost/helpers redis_db=$(ynh_app_setting_get --app=$app --key=redis_db) - +session_secret=$(ynh_app_setting_get --app=$app --key=session_secret) upgrade_type=$(ynh_check_app_version_changed) @@ -23,6 +23,15 @@ 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" +#================================================= +# ENSURE DOWNWARD COMPATIBILITY +#================================================= + +if [ -z "$session_secret" ]; then + session_secret=$(ynh_string_random --length=32) + ynh_app_setting_set --app=$app --key=session_secret --value=$session_secret +fi + #================================================= # UPGRADE DEPENDENCIES #================================================= From dbfbebe91d60ada0fbf88a76d05037715de75a55 Mon Sep 17 00:00:00 2001 From: Florent Date: Tue, 13 Aug 2024 10:39:29 +0200 Subject: [PATCH 9/9] Update tests.toml so it tests upgrade from 1.1.13 for Bookworm --- tests.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests.toml b/tests.toml index 9881b4d..1b3a836 100644 --- a/tests.toml +++ b/tests.toml @@ -10,4 +10,4 @@ test_format = 1.0 exclude = ["install.subdir", "install.nourl"] - test_upgrade_from.c98a6fb2.name = "Upgrade from 1.1.10" + test_upgrade_from.9fcb488.name = "Upgrade from 1.1.13"