From 069c7fdc2808c863aa6505fe540fdfb4d7943fd5 Mon Sep 17 00:00:00 2001 From: Fabian Wilkens Date: Tue, 4 Jan 2022 18:04:28 +0100 Subject: [PATCH 01/11] Fix: JavaScript heap out of memory #29 --- scripts/_common.sh | 2 ++ scripts/install | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index 19e6d2c..172122c 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -19,6 +19,8 @@ NODEJS_VERSION="15.11.0" SOURCE="https://github.com/standardnotes/web" COMMIT="e856ce7bfd3a7b357544e43ca343b1ec861debb3" +node_max_old_space_size=2048 + #================================================= # PERSONAL HELPERS #================================================= diff --git a/scripts/install b/scripts/install index 677b9db..7a7ef11 100644 --- a/scripts/install +++ b/scripts/install @@ -162,8 +162,8 @@ pushd "$final_path/live" ynh_exec_as $app $ynh_ruby_load_path bin/bundle config set --local path 'vendor/bundle' ynh_exec_as $app $ynh_ruby_load_path bin/bundle config set with 'development' ynh_exec_warn_less "ynh_exec_as $app $ynh_ruby_load_path bin/bundle install -j$(getconf _NPROCESSORS_ONLN) --quiet" - ynh_exec_warn_less "ynh_exec_as $app env PATH=$ynh_node_load_PATH yarn install --pure-lockfile" - ynh_exec_warn_less "ynh_exec_as $app env PATH=$ynh_node_load_PATH yarn bundle" + ynh_exec_warn_less "ynh_exec_as $app env NODE_OPTIONS=\"--max-old-space-size=$node_max_old_space_size\" PATH=$ynh_node_load_PATH yarn install --pure-lockfile" + ynh_exec_warn_less "ynh_exec_as $app env NODE_OPTIONS=\"--max-old-space-size=$node_max_old_space_size\" PATH=$ynh_node_load_PATH yarn bundle" ynh_exec_warn_less "ynh_exec_as $app $ynh_ruby_load_path bin/bundle exec rails assets:precompile --quiet" popd From 32b808f84d87113e2340bfb7da6c0db6fe365223 Mon Sep 17 00:00:00 2001 From: Fabian Wilkens Date: Tue, 4 Jan 2022 19:14:57 +0100 Subject: [PATCH 02/11] Fix: JavaScript heap out of memory #29 --- scripts/upgrade | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index 737bb1e..33ff967 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -182,8 +182,8 @@ then ynh_exec_as $app $ynh_ruby_load_path bin/bundle config set --local path 'vendor/bundle' ynh_exec_as $app $ynh_ruby_load_path bin/bundle config set with 'development' ynh_exec_warn_less "ynh_exec_as $app $ynh_ruby_load_path bin/bundle install -j$(getconf _NPROCESSORS_ONLN) --quiet" - ynh_exec_warn_less "ynh_exec_as $app env PATH=$ynh_node_load_PATH yarn install --pure-lockfile" - ynh_exec_warn_less "ynh_exec_as $app env PATH=$ynh_node_load_PATH yarn bundle" + ynh_exec_warn_less "ynh_exec_as $app env NODE_OPTIONS=\"--max-old-space-size=$node_max_old_space_size\" PATH=$ynh_node_load_PATH yarn install --pure-lockfile" + ynh_exec_warn_less "ynh_exec_as $app env NODE_OPTIONS=\"--max-old-space-size=$node_max_old_space_size\" PATH=$ynh_node_load_PATH yarn bundle" ynh_exec_warn_less "ynh_exec_as $app $ynh_ruby_load_path bin/bundle exec rails assets:precompile --quiet" popd fi From 7cace5b8e092d10faff9bc14ee2dd388b91e32cb Mon Sep 17 00:00:00 2001 From: Fabian Wilkens Date: Tue, 4 Jan 2022 19:24:09 +0100 Subject: [PATCH 03/11] Fix: linter: remove example value in manifest.json --- manifest.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/manifest.json b/manifest.json index 5155e6d..0dad915 100644 --- a/manifest.json +++ b/manifest.json @@ -31,8 +31,7 @@ "install": [ { "name": "domain", - "type": "domain", - "example": "example.com" + "type": "domain" }, { "name": "path", From fc2adebb26541910b7ca0d385a7e4cda28200551 Mon Sep 17 00:00:00 2001 From: Fabian Wilkens Date: Tue, 4 Jan 2022 19:28:23 +0100 Subject: [PATCH 04/11] Fix: linter: remove quotes at ynh_exec_warn_less --- scripts/install | 8 ++++---- scripts/upgrade | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/scripts/install b/scripts/install index 677b9db..22a9244 100644 --- a/scripts/install +++ b/scripts/install @@ -161,10 +161,10 @@ pushd "$final_path/live" ynh_use_nodejs ynh_exec_as $app $ynh_ruby_load_path bin/bundle config set --local path 'vendor/bundle' ynh_exec_as $app $ynh_ruby_load_path bin/bundle config set with 'development' - ynh_exec_warn_less "ynh_exec_as $app $ynh_ruby_load_path bin/bundle install -j$(getconf _NPROCESSORS_ONLN) --quiet" - ynh_exec_warn_less "ynh_exec_as $app env PATH=$ynh_node_load_PATH yarn install --pure-lockfile" - ynh_exec_warn_less "ynh_exec_as $app env PATH=$ynh_node_load_PATH yarn bundle" - ynh_exec_warn_less "ynh_exec_as $app $ynh_ruby_load_path bin/bundle exec rails assets:precompile --quiet" + ynh_exec_warn_less ynh_exec_as $app $ynh_ruby_load_path bin/bundle install -j$(getconf _NPROCESSORS_ONLN) --quiet + ynh_exec_warn_less ynh_exec_as $app env PATH=$ynh_node_load_PATH yarn install --pure-lockfile + ynh_exec_warn_less ynh_exec_as $app env PATH=$ynh_node_load_PATH yarn bundle + ynh_exec_warn_less ynh_exec_as $app $ynh_ruby_load_path bin/bundle exec rails assets:precompile --quiet popd #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index 737bb1e..a55368c 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -181,10 +181,10 @@ then ynh_use_nodejs ynh_exec_as $app $ynh_ruby_load_path bin/bundle config set --local path 'vendor/bundle' ynh_exec_as $app $ynh_ruby_load_path bin/bundle config set with 'development' - ynh_exec_warn_less "ynh_exec_as $app $ynh_ruby_load_path bin/bundle install -j$(getconf _NPROCESSORS_ONLN) --quiet" - ynh_exec_warn_less "ynh_exec_as $app env PATH=$ynh_node_load_PATH yarn install --pure-lockfile" - ynh_exec_warn_less "ynh_exec_as $app env PATH=$ynh_node_load_PATH yarn bundle" - ynh_exec_warn_less "ynh_exec_as $app $ynh_ruby_load_path bin/bundle exec rails assets:precompile --quiet" + ynh_exec_warn_less ynh_exec_as $app $ynh_ruby_load_path bin/bundle install -j$(getconf _NPROCESSORS_ONLN) --quiet + ynh_exec_warn_less ynh_exec_as $app env PATH=$ynh_node_load_PATH yarn install --pure-lockfile + ynh_exec_warn_less ynh_exec_as $app env PATH=$ynh_node_load_PATH yarn bundle + ynh_exec_warn_less ynh_exec_as $app $ynh_ruby_load_path bin/bundle exec rails assets:precompile --quiet popd fi From 632a897edefe7ee314643fed76efc44b8583e1c3 Mon Sep 17 00:00:00 2001 From: Fabian Wilkens Date: Tue, 4 Jan 2022 19:31:01 +0100 Subject: [PATCH 05/11] Fix: linter: remove ynh_webpath_available --- scripts/restore | 2 -- 1 file changed, 2 deletions(-) diff --git a/scripts/restore b/scripts/restore index 6e77925..f46a689 100755 --- a/scripts/restore +++ b/scripts/restore @@ -37,8 +37,6 @@ final_path=$(ynh_app_setting_get --app=$app --key=final_path) #================================================= ynh_script_progression --message="Validating restoration parameters..." --weight=1 -ynh_webpath_available --domain=$domain --path_url=$path_url \ - || ynh_die --message="Path not available: ${domain}${path_url}" test ! -d $final_path \ || ynh_die --message="There is already a directory: $final_path " From 1a7dd39ecef885c9e2c3bba29baff9b0e3753ed9 Mon Sep 17 00:00:00 2001 From: Fabian Wilkens Date: Tue, 4 Jan 2022 19:33:38 +0100 Subject: [PATCH 06/11] Fix: linter: remove examples from Disclaimer --- doc/DISCLAIMER.md | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/doc/DISCLAIMER.md b/doc/DISCLAIMER.md index 7711f9a..22efad9 100644 --- a/doc/DISCLAIMER.md +++ b/doc/DISCLAIMER.md @@ -1,11 +1,10 @@ -* Any known limitations, constrains or stuff not working, such as (but not limited to): - * No single-sign on or LDAP integration - * The app requires up 1500MB of RAM to install - * The app requires at least 80MB of RAM to work properly. - * The app requires around 1000MB of disk. - * A dedicated domain is requierd if you want to use extensions. - * notes.your-domain.tld/ -> Extension Manager is working - * your-domain.tld/notes/ -> Extension Manager is not working +* No single-sign on or LDAP integration +* The app requires up 1500MB of RAM to install +* The app requires at least 80MB of RAM to work properly. +* The app requires around 1000MB of disk. -* Other infos that people should be aware of, such as: - * The config-file is stored under "/opt/yunohost/$app/live/.env" +* A dedicated domain is requierd if you want to use extensions. + * notes.your-domain.tld/ -> Extension Manager is working + * your-domain.tld/notes/ -> Extension Manager is not working + +* The config-file is stored under "/opt/yunohost/$app/live/.env" From 50da702ae23744ad3ce91551acb7a4968a08b167 Mon Sep 17 00:00:00 2001 From: Fabian Wilkens Date: Tue, 4 Jan 2022 19:36:04 +0100 Subject: [PATCH 07/11] Fix: linter: remove http->https redirect --- conf/nginx.conf | 5 ----- 1 file changed, 5 deletions(-) diff --git a/conf/nginx.conf b/conf/nginx.conf index dbf605d..52614d4 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -3,11 +3,6 @@ location __PATH__/ { # Path to source alias __FINALPATH__/live/public ; - # Force usage of https - if ($scheme = http) { - rewrite ^ https://$server_name$request_uri? permanent; - } - # Common parameter to increase upload size limit in conjunction with dedicated php-fpm file client_max_body_size 25M; From d76104362359c9a4804862cf257dc2c9fddb025f Mon Sep 17 00:00:00 2001 From: Yunohost-Bot <> Date: Tue, 4 Jan 2022 18:36:53 +0000 Subject: [PATCH 08/11] Auto-update README --- README.md | 19 +++++++++---------- README_fr.md | 19 +++++++++---------- 2 files changed, 18 insertions(+), 20 deletions(-) diff --git a/README.md b/README.md index 5824872..7b5a895 100644 --- a/README.md +++ b/README.md @@ -27,17 +27,16 @@ The Standard Notes Web App. An end-to-end encrypted note-taking app. Web, Mac, W ## Disclaimers / important information -* Any known limitations, constrains or stuff not working, such as (but not limited to): - * No single-sign on or LDAP integration - * The app requires up 1500MB of RAM to install - * The app requires at least 80MB of RAM to work properly. - * The app requires around 1000MB of disk. - * A dedicated domain is requierd if you want to use extensions. - * notes.your-domain.tld/ -> Extension Manager is working - * your-domain.tld/notes/ -> Extension Manager is not working +* No single-sign on or LDAP integration +* The app requires up 1500MB of RAM to install +* The app requires at least 80MB of RAM to work properly. +* The app requires around 1000MB of disk. -* Other infos that people should be aware of, such as: - * The config-file is stored under "/opt/yunohost/$app/live/.env" +* A dedicated domain is requierd if you want to use extensions. + * notes.your-domain.tld/ -> Extension Manager is working + * your-domain.tld/notes/ -> Extension Manager is not working + +* The config-file is stored under "/opt/yunohost/$app/live/.env" ## Documentation and resources diff --git a/README_fr.md b/README_fr.md index 2133420..bbd420c 100644 --- a/README_fr.md +++ b/README_fr.md @@ -23,17 +23,16 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour ## Avertissements / informations importantes -* Any known limitations, constrains or stuff not working, such as (but not limited to): - * No single-sign on or LDAP integration - * The app requires up 1500MB of RAM to install - * The app requires at least 80MB of RAM to work properly. - * The app requires around 1000MB of disk. - * A dedicated domain is requierd if you want to use extensions. - * notes.your-domain.tld/ -> Extension Manager is working - * your-domain.tld/notes/ -> Extension Manager is not working +* No single-sign on or LDAP integration +* The app requires up 1500MB of RAM to install +* The app requires at least 80MB of RAM to work properly. +* The app requires around 1000MB of disk. -* Other infos that people should be aware of, such as: - * The config-file is stored under "/opt/yunohost/$app/live/.env" +* A dedicated domain is requierd if you want to use extensions. + * notes.your-domain.tld/ -> Extension Manager is working + * your-domain.tld/notes/ -> Extension Manager is not working + +* The config-file is stored under "/opt/yunohost/$app/live/.env" ## Documentations et ressources From 23ac5e7be0f5d2f86b07a9c17771f0ee9909f931 Mon Sep 17 00:00:00 2001 From: Fabian Wilkens <46000361+FabianWilkens@users.noreply.github.com> Date: Wed, 5 Jan 2022 19:44:37 +0100 Subject: [PATCH 09/11] Update manifest.json --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index 0dad915..cc540f2 100644 --- a/manifest.json +++ b/manifest.json @@ -5,7 +5,7 @@ "description": { "en": "The Standard Notes Web App. An end-to-end encrypted note-taking app. Web, Mac, Windows, Linux, iOS, and Android." }, - "version": "3.8.25~ynh1", + "version": "3.8.25~ynh2", "url": "https://github.com/standardnotes/web", "upstream": { "license": "AGPL-3.0-or-later", From 2c1f9f36881d1ade3d43b2bbe2d6605b6a1385c9 Mon Sep 17 00:00:00 2001 From: Yunohost-Bot <> Date: Wed, 5 Jan 2022 18:44:40 +0000 Subject: [PATCH 10/11] 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 7b5a895..60903dc 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in The Standard Notes Web App. An end-to-end encrypted note-taking app. Web, Mac, Windows, Linux, iOS, and Android. -**Shipped version:** 3.8.25~ynh1 +**Shipped version:** 3.8.25~ynh2 **Demo:** https://standardnotes.org/demo diff --git a/README_fr.md b/README_fr.md index bbd420c..ae1ecf5 100644 --- a/README_fr.md +++ b/README_fr.md @@ -13,7 +13,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour -**Version incluse :** 3.8.25~ynh1 +**Version incluse :** 3.8.25~ynh2 **Démo :** https://standardnotes.org/demo From 5b52d708e50eeff69719fc0d81e1dba08c682327 Mon Sep 17 00:00:00 2001 From: Fabian Wilkens <46000361+FabianWilkens@users.noreply.github.com> Date: Wed, 5 Jan 2022 19:46:07 +0100 Subject: [PATCH 11/11] Update check_process --- check_process | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/check_process b/check_process index 8da872b..b9c557d 100644 --- a/check_process +++ b/check_process @@ -11,10 +11,8 @@ setup_private=1 setup_public=1 upgrade=1 - # 3.8.21~ynh1 - upgrade=1 from_commit=5df29231f1fb18e7ce49949fdcf7c9275ce19ffc - # 3.6.8~ynh2 - upgrade=1 from_commit=89de808ffc824be93a4394abcf45219f9376dfa5 + # 3.8.25~ynh1 + upgrade=1 from_commit=e513a1b7cf3977272abefbaac6a32cfac596858d backup_restore=1 multi_instance=1 port_already_use=0 @@ -23,6 +21,6 @@ Email= Notification=none ;;; Upgrade options - ; commit=5df29231f1fb18e7ce49949fdcf7c9275ce19ffc - name=3.8.21~ynh1 + ; commit=e513a1b7cf3977272abefbaac6a32cfac596858d + name=3.8.25~ynh1 manifest_arg=domain=DOMAIN&is_public=1