From 9ed71d759a5b9721a9190eb2598d22d0e5d65ff5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 9 May 2024 19:13:17 +0200 Subject: [PATCH 1/7] Update settings.json --- conf/settings.json | 41 ++++++++++++++++++++++++++++++++--------- 1 file changed, 32 insertions(+), 9 deletions(-) diff --git a/conf/settings.json b/conf/settings.json index a131657..f470605 100644 --- a/conf/settings.json +++ b/conf/settings.json @@ -292,14 +292,6 @@ */ "soffice": null, - /* - * Path to the Tidy executable. - * - * Tidy is used to improve the quality of exported pads. - * Setting it to null disables Tidy. - */ - "tidyHtml": null, - /* * Allow import of file types other than the supported ones: * txt, doc, docx, rtf, odt, html & htm @@ -627,5 +619,36 @@ /* * Enable/Disable case-insensitive pad names. */ - "lowerCasePadIds": false + "lowerCasePadIds": false, + + "sso": { + "issuer": "${SSO_ISSUER:http://localhost:9001}", + "clients": [ + { + "client_id": "${ADMIN_CLIENT:admin_client}", + "client_secret": "${ADMIN_SECRET:admin}", + "grant_types": ["authorization_code"], + "response_types": ["code"], + "redirect_uris": ["${ADMIN_REDIRECT:http://localhost:9001/admin/}"] + }, + { + "client_id": "${USER_CLIENT:user_client}", + "client_secret": "${USER_SECRET:user}", + "grant_types": ["authorization_code"], + "response_types": ["code"], + "redirect_uris": ["${USER_REDIRECT:http://localhost:9001/}"] + } + ] + } + + /* Set the time to live for the tokens + This is the time of seconds a user is logged into Etherpad + "ttl": { + "AccessToken": 3600, + "AuthorizationCode": 600, + "ClientCredentials": 3600, + "IdToken": 3600, + "RefreshToken": 86400 + } + */ } From 2350f97e1eefaac2006f53a80560e939935ef598 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 9 May 2024 19:18:30 +0200 Subject: [PATCH 2/7] Update settings.json --- conf/settings.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/conf/settings.json b/conf/settings.json index f470605..0bf1424 100644 --- a/conf/settings.json +++ b/conf/settings.json @@ -622,21 +622,21 @@ "lowerCasePadIds": false, "sso": { - "issuer": "${SSO_ISSUER:http://localhost:9001}", + "issuer": "${SSO_ISSUER:http://127.0.0.1:__PORT__}", "clients": [ { "client_id": "${ADMIN_CLIENT:admin_client}", "client_secret": "${ADMIN_SECRET:admin}", "grant_types": ["authorization_code"], "response_types": ["code"], - "redirect_uris": ["${ADMIN_REDIRECT:http://localhost:9001/admin/}"] + "redirect_uris": ["${ADMIN_REDIRECT:http://127.0.0.1:__PORT__/admin/}"] }, { "client_id": "${USER_CLIENT:user_client}", "client_secret": "${USER_SECRET:user}", "grant_types": ["authorization_code"], "response_types": ["code"], - "redirect_uris": ["${USER_REDIRECT:http://localhost:9001/}"] + "redirect_uris": ["${USER_REDIRECT:http://127.0.0.1:__PORT__/}"] } ] } From a33e08210c3c33c8d47acbd31e1aadb12aa8adc4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 9 May 2024 19:18:56 +0200 Subject: [PATCH 3/7] Update systemd.service --- conf/systemd.service | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/conf/systemd.service b/conf/systemd.service index 559f1e1..d2aa174 100644 --- a/conf/systemd.service +++ b/conf/systemd.service @@ -7,11 +7,9 @@ Type=simple User=__APP__ Group=__APP__ WorkingDirectory=__INSTALL_DIR__/ -Environment=ETHERPAD_PRODUCTION=true Environment="NODE_ENV=production" Environment="__YNH_NODE_LOAD_PATH__" -ExecStart=__INSTALL_DIR__/bin/run.sh -#ExecStart=pnpm run prod +ExecStart=pnpm run prod Restart=always # Sandboxing options to harden security From d5f0ba7de580bd72474e95f86196bc64c0612646 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 9 May 2024 19:20:53 +0200 Subject: [PATCH 4/7] Update _common.sh --- scripts/_common.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index b1ab6a0..2b9094e 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -4,7 +4,7 @@ # COMMON VARIABLES #================================================= -nodejs_version=20 +nodejs_version=22 #================================================= # PERSONAL HELPERS From b3fd9fd9b5a45f06216a42b0099357f5748038ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 9 May 2024 19:22:15 +0200 Subject: [PATCH 5/7] Revert "Update systemd.service" This reverts commit a33e08210c3c33c8d47acbd31e1aadb12aa8adc4. --- conf/systemd.service | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/conf/systemd.service b/conf/systemd.service index d2aa174..559f1e1 100644 --- a/conf/systemd.service +++ b/conf/systemd.service @@ -7,9 +7,11 @@ Type=simple User=__APP__ Group=__APP__ WorkingDirectory=__INSTALL_DIR__/ +Environment=ETHERPAD_PRODUCTION=true Environment="NODE_ENV=production" Environment="__YNH_NODE_LOAD_PATH__" -ExecStart=pnpm run prod +ExecStart=__INSTALL_DIR__/bin/run.sh +#ExecStart=pnpm run prod Restart=always # Sandboxing options to harden security From 4bee65d01e66c4b22f71eac3cb033742c3751dc4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 9 May 2024 20:38:46 +0200 Subject: [PATCH 6/7] Update install --- scripts/install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index 0a0f018..c287ea3 100644 --- a/scripts/install +++ b/scripts/install @@ -80,7 +80,7 @@ ynh_script_progression --message="Installing $app..." --weight=10 pushd $install_dir ynh_use_nodejs - ynh_exec_warn_less npm install pnpm -g + #ynh_exec_warn_less npm install pnpm -g ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH ETHERPAD_PRODUCTION=true bin/installDeps.sh popd From a8595a93af482c0ca4411626a0a846f11b5857ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 9 May 2024 20:45:47 +0200 Subject: [PATCH 7/7] Update install --- scripts/install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index c287ea3..0a0f018 100644 --- a/scripts/install +++ b/scripts/install @@ -80,7 +80,7 @@ ynh_script_progression --message="Installing $app..." --weight=10 pushd $install_dir ynh_use_nodejs - #ynh_exec_warn_less npm install pnpm -g + ynh_exec_warn_less npm install pnpm -g ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH ETHERPAD_PRODUCTION=true bin/installDeps.sh popd