Merge pull request #48 from YunoHost-Apps/testing

2021.09.09~ynh1
2024-09-03 20:26:22 +02:00 · 2021-09-19 08:19:40 +02:00 · 2021-09-19 08:19:40 +02:00 · 855bdcb966
commit 855bdcb966
parent 42d12bd9aa ee3cb8cf2d
13 changed files with 39 additions and 36 deletions
--- 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 syncing server. An end-to-end encrypted note-taking app.

-**Shipped version:** 2021.08.30~ynh1
+**Shipped version:** 2021.09.09~ynh1

 **Demo:** https://standardnotes.org/demo

--- 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 :** 2021.08.30~ynh1
+**Version incluse :** 2021.09.09~ynh1

 **Démo :** https://standardnotes.org/demo

--- a/conf/app_api-gateway.src
+++ b/conf/app_api-gateway.src
@ -1,5 +1,5 @@
-SOURCE_URL=https://github.com/standardnotes/api-gateway/archive/1.24.0.tar.gz
-SOURCE_SUM=97EF89B8951448BB7B34D0B9A30DB242E23808EF1FFC5B154CC1C823965A8B39
+SOURCE_URL=https://github.com/standardnotes/api-gateway/archive/1.25.0.tar.gz
+SOURCE_SUM=B83FF5C2C642070F7A06DD77B657935C3EBCCF8E287F9BD7A6C4069E7106E47B
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=tar.gz
 SOURCE_IN_SUBDIR=true
--- a/conf/app_auth.src
+++ b/conf/app_auth.src
@ -1,5 +1,5 @@
-SOURCE_URL=https://github.com/standardnotes/auth/archive/1.17.4.tar.gz
-SOURCE_SUM=a9d8a8db89c16b2f251d85135a70c2eee9d9b7c228be8a0322a9dd68acbce8b4
+SOURCE_URL=https://github.com/standardnotes/auth/archive/1.19.1.tar.gz
+SOURCE_SUM=A25F9B57E6D03725C739A41891D85224CC1218534DAA3F2213803703FE8A7D67
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=tar.gz
 SOURCE_IN_SUBDIR=true
--- a/conf/app_syncing-server-js.src
+++ b/conf/app_syncing-server-js.src
@ -1,5 +1,5 @@
-SOURCE_URL=https://github.com/standardnotes/syncing-server-js/archive/1.38.9.tar.gz
-SOURCE_SUM=80f3d3386457328ce2ed51ba0f41f859f9ba3fe65cf0ac0bb36d6116f16872c6
+SOURCE_URL=https://github.com/standardnotes/syncing-server-js/archive/1.39.0.tar.gz
+SOURCE_SUM=4B320DE63D388356B2B5576784FA2F8A49D0C44419FF73495C9997CC92F7E294
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=tar.gz
 SOURCE_IN_SUBDIR=true
--- a/conf/env_auth-worker.env.sample
+++ b/conf/env_auth-worker.env.sample
@ -43,9 +43,6 @@ SNS_AWS_REGION=
 SQS_QUEUE_URL=
 SQS_AWS_REGION=

-USER_SERVER_REGISTRATION_URL=
-USER_SERVER_AUTH_KEY=
-
 SYNCING_SERVER_URL=http://localhost:__PORT_SYNCING_SERVER_JS__

 REDIS_EVENTS_CHANNEL=events
@ -61,3 +58,8 @@ NEW_RELIC_LOG_LEVEL=info

 # (Optional) Extensions Server
 EXTENSION_SERVER_URL=
+
+# (Optional) User Server
+USER_SERVER_REGISTRATION_URL=
+USER_SERVER_CHANGE_EMAIL_URL=
+USER_SERVER_AUTH_KEY=
--- a/conf/env_auth.env.sample
+++ b/conf/env_auth.env.sample
@ -43,9 +43,6 @@ SNS_AWS_REGION=
 SQS_QUEUE_URL=
 SQS_AWS_REGION=

-USER_SERVER_REGISTRATION_URL=
-USER_SERVER_AUTH_KEY=
-
 SYNCING_SERVER_URL=http://localhost:__PORT_SYNCING_SERVER_JS__

 REDIS_EVENTS_CHANNEL=events
@ -61,3 +58,8 @@ NEW_RELIC_LOG_LEVEL=info

 # (Optional) Extensions Server
 EXTENSION_SERVER_URL=
+
+# (Optional) User Server
+USER_SERVER_REGISTRATION_URL=
+USER_SERVER_CHANGE_EMAIL_URL=
+USER_SERVER_AUTH_KEY=
--- a/manifest.json
+++ b/manifest.json
@ -5,7 +5,7 @@
    "description": {
        "en": "The Standard Notes syncing server. An end-to-end encrypted note-taking app."
    },
-    "version": "2021.08.30~ynh1",
+    "version": "2021.09.09~ynh1",
    "url": "https://github.com/standardnotes/standalone",
 	"upstream": {
        "license": "AGPL-3.0-or-later",
@ -32,8 +32,7 @@
        "install" : [
            {
                "name": "domain",
-                "type": "domain",
-                "example": "example.com"
+                "type": "domain"
            },
            {
                "name": "path",
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@ -6,12 +6,13 @@
 RUBY_VERSION="2.7.3"
 NODEJS_VERSION="15.11.0"

-syncing_server_js_version="1.38.9"
-auth_version="1.17.4"
-api_gateway_version="1.24.0"
+syncing_server_js_version="1.39.0"
+auth_version="1.19.1"
+api_gateway_version="1.25.0"
 extensions_version="2021.08.27"

-swap_needed=1536
+swap_needed=2048
+node_max_old_space_size=6144

 # dependencies used by the app
 pkg_dependencies=""
--- a/scripts/change_url
+++ b/scripts/change_url
@ -119,14 +119,14 @@ fi

 ynh_replace_string \
    --match_string='url": "https://.*/extensions/src/' \
-    --replace_string='url": "https://'$domain$path'/extensions/src/' \
+    --replace_string='url": "https://'$new_domain$path'/extensions/src/' \
    --target_file="$final_path_extensions/repo.json"

 find "$final_path_extensions/src/" -name "*.json" -print0 | while read -d $'\0' file
 do
    ynh_replace_string \
        --match_string='url": "https://.*/extensions/src/' \
-        --replace_string='url": "https://'$domain$path'extensions/src/' \
+        --replace_string='url": "https://'$new_domain$path'extensions/src/' \
        --target_file="$file"
 done

--- a/scripts/install
+++ b/scripts/install
@ -208,18 +208,18 @@ ynh_script_progression --message="Installing Standard Notes - Syncing Server..."
 ynh_use_nodejs
 pushd "$final_path/live/syncing-server-js"
    ynh_print_info "Installing ... [1/3]"
-    ynh_exec_as $app env NODE_OPTIONS="--max-old-space-size=4096" PATH=$ynh_node_load_PATH yarn install --pure-lockfile
-    ynh_exec_as $app env NODE_OPTIONS="--max-old-space-size=4096" PATH=$ynh_node_load_PATH yarn build
+    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_as $app env NODE_OPTIONS="--max-old-space-size=$node_max_old_space_size" PATH=$ynh_node_load_PATH yarn build
 popd
 pushd "$final_path/live/auth"
    ynh_print_info "Installing ... [2/3]"
-    ynh_exec_as $app env NODE_OPTIONS="--max-old-space-size=4096" PATH=$ynh_node_load_PATH yarn install --pure-lockfile
-    ynh_exec_as $app env NODE_OPTIONS="--max-old-space-size=4096" PATH=$ynh_node_load_PATH yarn build
+    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_as $app env NODE_OPTIONS="--max-old-space-size=$node_max_old_space_size" PATH=$ynh_node_load_PATH yarn build
 popd
 pushd "$final_path/live/api-gateway"
    ynh_print_info "Installing ... [3/3]"
-    ynh_exec_as $app env NODE_OPTIONS="--max-old-space-size=4096" PATH=$ynh_node_load_PATH yarn install --pure-lockfile
-    ynh_exec_as $app env NODE_OPTIONS="--max-old-space-size=4096" PATH=$ynh_node_load_PATH yarn build
+    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_as $app env NODE_OPTIONS="--max-old-space-size=$node_max_old_space_size" PATH=$ynh_node_load_PATH yarn build
 popd
 #=================================================
 # INSTALLING Standard Notes - Extensions
--- a/scripts/restore
+++ b/scripts/restore
@ -53,7 +53,6 @@ config_api_gateway="$final_path/live/api-gateway.env"
 #=================================================
 ynh_script_progression --message="Validating restoration parameters..." --weight=2

-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 "
 test ! -d $final_path_www || ynh_die --message="There is already a directory: $final_path_www "

--- a/scripts/upgrade
+++ b/scripts/upgrade
@ -410,24 +410,24 @@ then
    if [[ "$syncing_server_js_version_installed" < "$syncing_server_js_version" ]]
    then
        pushd "$final_path/live/syncing-server-js"
-            ynh_exec_as $app env NODE_OPTIONS="--max-old-space-size=4096" PATH=$ynh_node_load_PATH yarn install --pure-lockfile
-            ynh_exec_as $app env NODE_OPTIONS="--max-old-space-size=4096" PATH=$ynh_node_load_PATH yarn build
+            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_as $app env NODE_OPTIONS="--max-old-space-size=$node_max_old_space_size" PATH=$ynh_node_load_PATH yarn build
        popd
        ynh_app_setting_set --app=$app --key=syncing_server_js_version --value=$syncing_server_js_version
    fi
    if [[ "$auth_version_installed" < "$auth_version" ]]
    then
        pushd "$final_path/live/auth"
-            ynh_exec_as $app env NODE_OPTIONS="--max-old-space-size=4096" PATH=$ynh_node_load_PATH yarn install --pure-lockfile
-            ynh_exec_as $app env NODE_OPTIONS="--max-old-space-size=4096" PATH=$ynh_node_load_PATH yarn build
+            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_as $app env NODE_OPTIONS="--max-old-space-size=$node_max_old_space_size" PATH=$ynh_node_load_PATH yarn build
        popd
        ynh_app_setting_set --app=$app --key=auth_version --value=$auth_version
    fi
    if [[ "$api_gateway_version_installed" < "$api_gateway_version" ]]
    then
        pushd "$final_path/live/api-gateway"
-            ynh_exec_as $app env NODE_OPTIONS="--max-old-space-size=4096" PATH=$ynh_node_load_PATH yarn install --pure-lockfile
-            ynh_exec_as $app env NODE_OPTIONS="--max-old-space-size=4096" PATH=$ynh_node_load_PATH yarn build
+            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_as $app env NODE_OPTIONS="--max-old-space-size=$node_max_old_space_size" PATH=$ynh_node_load_PATH yarn build
        popd
        ynh_app_setting_set --app=$app --key=api_gateway_version --value=$api_gateway_version
    fi