From 7791d2d820d40bcd1ef653aef80768e3f9b5234e Mon Sep 17 00:00:00 2001 From: Florent Date: Sun, 19 Nov 2023 22:52:20 +0100 Subject: [PATCH 01/10] Add node env in systemd unit + progression weight --- conf/systemd.service | 1 + scripts/install | 2 +- scripts/upgrade | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/conf/systemd.service b/conf/systemd.service index 7e268cf..1c55900 100644 --- a/conf/systemd.service +++ b/conf/systemd.service @@ -11,6 +11,7 @@ ExecStart=__INSTALL_DIR__/sandbox/run.sh StandardOutput=journal StandardError=journal EnvironmentFile=__INSTALL_DIR__/default.env +Environment="__YNH_NODE_LOAD_PATH__" # Sandboxing options to harden security # Depending on specificities of your service/app, you may need to tweak these diff --git a/scripts/install b/scripts/install index d372ace..2379431 100755 --- a/scripts/install +++ b/scripts/install @@ -22,7 +22,7 @@ ynh_exec_warn_less ynh_install_nodejs --nodejs_version=$nodejs_version # DOWNLOAD, CHECK AND UNPACK SOURCE #================================================= -ynh_script_progression --message="Setting up source files..." --weight=1 +ynh_script_progression --message="Setting up source files..." --weight=20 # Download, check integrity, uncompress and patch the source from manifest.toml ynh_setup_source --dest_dir="$install_dir" diff --git a/scripts/upgrade b/scripts/upgrade index 2db493d..ce176b5 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -39,7 +39,7 @@ ynh_exec_warn_less ynh_install_nodejs --nodejs_version=$nodejs_version if [ "$upgrade_type" == "UPGRADE_APP" ] then - ynh_script_progression --message="Upgrading source files..." --weight=1 + ynh_script_progression --message="Upgrading source files..." --weight=20 # Download, check integrity, uncompress and patch the source from manifest.toml ynh_setup_source --dest_dir="$install_dir" From 5b2ef335351c21e5093f312ad8e7111629139859 Mon Sep 17 00:00:00 2001 From: Florent Date: Mon, 20 Nov 2023 12:30:54 +0100 Subject: [PATCH 02/10] Fix 502 http error --- conf/nginx.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/nginx.conf b/conf/nginx.conf index 5445910..27852a1 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -1,7 +1,7 @@ #sub_path_only rewrite ^__PATH__$ __PATH__/ permanent; location __PATH__/ { - proxy_pass http://127.0.0.1:__PORT__; + proxy_pass http://localhost:__PORT__; proxy_redirect off; proxy_set_header Host $host; proxy_set_header X-Real-IP $remote_addr; From 07392e811953ae0413d9c7a17d1743b49adb81bd Mon Sep 17 00:00:00 2001 From: Florent Date: Mon, 20 Nov 2023 12:31:21 +0100 Subject: [PATCH 03/10] Pass email and trust header (SSOWat prevents users from spoofing) --- conf/default.env | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conf/default.env b/conf/default.env index a5cea7c..d7502f2 100644 --- a/conf/default.env +++ b/conf/default.env @@ -10,8 +10,8 @@ TYPEORM_DATABASE=__DATA_DIR__/home.db PORT=__PORT__ # Authentication -GRIST_FORWARD_AUTH_HEADER=remote-user -GRIST_IGNORE_SESSION=0 +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 GRIST_WIDGET_LIST_URL=https://github.com/gristlabs/grist-widget/releases/download/latest/manifest.json From 600121e4d1d417944ee3d070363b92bec3520e2c Mon Sep 17 00:00:00 2001 From: Florent Date: Mon, 20 Nov 2023 12:32:58 +0100 Subject: [PATCH 04/10] Bump version --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index 71f455a..0db55b3 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.7~ynh1" +version = "1.1.7~ynh2" maintainers = ["fflorent"] From 517b8d9ced01864f2a9ab97dbf21b67e04b7aee4 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Mon, 20 Nov 2023 11:33:11 +0000 Subject: [PATCH 05/10] Auto-update README --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index f9337fe..24f6da0 100644 --- a/README.md +++ b/README.md @@ -28,7 +28,7 @@ Grist is a hybrid database/spreadsheet, meaning that: More about the features can be found here: -**Shipped version:** 1.1.7~ynh1 +**Shipped version:** 1.1.7~ynh2 **Demo:** https://docs.getgrist.com diff --git a/README_fr.md b/README_fr.md index 7e7b6ab..8c5c738 100644 --- a/README_fr.md +++ b/README_fr.md @@ -28,7 +28,7 @@ Grist est une solution hybridant la base de données et le tableur, ce qui signi Plus d'information sur les fonctionnalités sont disponibles ici : -**Version incluse :** 1.1.7~ynh1 +**Version incluse :** 1.1.7~ynh2 **Démo :** https://docs.getgrist.com From 215d490fe6bb121480fb3672bbe0d27013bdd184 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Mon, 20 Nov 2023 17:16:37 +0100 Subject: [PATCH 06/10] Upgrade to v1.1.8 --- manifest.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/manifest.toml b/manifest.toml index 0db55b3..b57dd6d 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.7~ynh2" +version = "1.1.8~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.7.tar.gz" - sha256 = "9a88ee33ed50786379eb85fdf30d6be1761a7ce402eb4756e4fa0474c862709c" + url = "https://github.com/gristlabs/grist-core/archive/refs/tags/v1.1.8.tar.gz" + sha256 = "b5ffff86808de1d3b30ab800150032d10e67adfde6f007a7c0a0942e73c4a56e" autoupdate.strategy = "latest_github_tag" From 4514106778d066e15420bc08f3c348bebb7b70ba Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Mon, 20 Nov 2023 16:16:41 +0000 Subject: [PATCH 07/10] Auto-update README --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 24f6da0..a55afbc 100644 --- a/README.md +++ b/README.md @@ -28,7 +28,7 @@ Grist is a hybrid database/spreadsheet, meaning that: More about the features can be found here: -**Shipped version:** 1.1.7~ynh2 +**Shipped version:** 1.1.8~ynh1 **Demo:** https://docs.getgrist.com diff --git a/README_fr.md b/README_fr.md index 8c5c738..3225d7d 100644 --- a/README_fr.md +++ b/README_fr.md @@ -28,7 +28,7 @@ Grist est une solution hybridant la base de données et le tableur, ce qui signi Plus d'information sur les fonctionnalités sont disponibles ici : -**Version incluse :** 1.1.7~ynh2 +**Version incluse :** 1.1.8~ynh1 **Démo :** https://docs.getgrist.com From e6b8c40b1560d14441551e09323f977935a8ad68 Mon Sep 17 00:00:00 2001 From: Florent Date: Tue, 21 Nov 2023 22:13:27 +0100 Subject: [PATCH 08/10] Attempt to make pyodide build work #7 --- scripts/install | 2 +- scripts/upgrade | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/install b/scripts/install index 2379431..38b3f5a 100755 --- a/scripts/install +++ b/scripts/install @@ -38,7 +38,7 @@ pushd "$install_dir" popd pushd "$install_dir/sandbox/pyodide" - ynh_exec_warn_less ynh_exec_as $app make setup + ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH make setup popd #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index ce176b5..53f0f2a 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -58,7 +58,7 @@ then popd pushd "$install_dir/sandbox/pyodide" - ynh_exec_warn_less ynh_exec_as $app make setup + ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH make setup popd fi From 082f778999db4ced89c5528bd54e5bedabbe798b Mon Sep 17 00:00:00 2001 From: Florent Date: Tue, 21 Nov 2023 22:41:31 +0100 Subject: [PATCH 09/10] Add a limitation --- doc/DESCRIPTION.md | 4 ++++ doc/DESCRIPTION_fr.md | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/doc/DESCRIPTION.md b/doc/DESCRIPTION.md index a150602..739111a 100644 --- a/doc/DESCRIPTION.md +++ b/doc/DESCRIPTION.md @@ -8,3 +8,7 @@ Grist is a hybrid database/spreadsheet, meaning that: - 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; diff --git a/doc/DESCRIPTION_fr.md b/doc/DESCRIPTION_fr.md index 6e34c72..d959885 100644 --- a/doc/DESCRIPTION_fr.md +++ b/doc/DESCRIPTION_fr.md @@ -8,3 +8,7 @@ Grist est une solution hybridant la base de données et le tableur, ce qui signi - Que les colonnes peuvent être remplies à l'aide de formules, similaires à celles des tableurs, avec une mise à jour automatique quand les cellules référencées sont modifiées. Plus d'information sur les fonctionnalités sont disponibles ici : + +### Limitations + +- Vous ne pouvez pas vous déconnecter depuis Grist, pour ce faire, vous devez vous déconnecter de Yunohost ; From 24cf94dc444b2090408fba1e6169f22aa911f249 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Tue, 21 Nov 2023 21:41:52 +0000 Subject: [PATCH 10/10] Auto-update README --- README.md | 4 ++++ README_fr.md | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/README.md b/README.md index a55afbc..acc39c6 100644 --- a/README.md +++ b/README.md @@ -27,6 +27,10 @@ Grist is a hybrid database/spreadsheet, meaning that: 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; + **Shipped version:** 1.1.8~ynh1 diff --git a/README_fr.md b/README_fr.md index 3225d7d..e03ae5e 100644 --- a/README_fr.md +++ b/README_fr.md @@ -27,6 +27,10 @@ Grist est une solution hybridant la base de données et le tableur, ce qui signi Plus d'information sur les fonctionnalités sont disponibles ici : +### Limitations + +- Vous ne pouvez pas vous déconnecter depuis Grist, pour ce faire, vous devez vous déconnecter de Yunohost ; + **Version incluse :** 1.1.8~ynh1