From 24ce08824b04802e32364b501b51484f06404d42 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Fri, 29 Oct 2021 12:36:54 +0000 Subject: [PATCH 1/3] Upgrade to 2021.10.29 --- conf/app_api-gateway.src | 4 ++-- conf/app_auth.src | 4 ++-- conf/app_syncing-server-js.src | 4 ++-- manifest.json | 2 +- scripts/_common.sh | 6 +++--- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/conf/app_api-gateway.src b/conf/app_api-gateway.src index f3d2353..6459069 100644 --- 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.25.1.tar.gz -SOURCE_SUM=fa9095331e5a0eb18e4d91812697d680b6b175c661b47261bb37f48d7677b42c +SOURCE_URL=https://github.com/standardnotes/api-gateway/archive/1.26.1.tar.gz +SOURCE_SUM=3fe3ea593dc1feca708c35786bf140f8445d964a4503145d0aa268bf0091a337 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/conf/app_auth.src b/conf/app_auth.src index 0de7a57..9a7af15 100644 --- a/conf/app_auth.src +++ b/conf/app_auth.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/standardnotes/auth/archive/1.22.1.tar.gz -SOURCE_SUM=c1a56542498a830e772cc3db4d2e85ec66965b972a00af13c822cec65313acc7 +SOURCE_URL=https://github.com/standardnotes/auth/archive/1.24.2.tar.gz +SOURCE_SUM=8a38eb876a2b8c4b65309c7dd94df71817d8267e86377618a76964561ed7a45c SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/conf/app_syncing-server-js.src b/conf/app_syncing-server-js.src index 17dab18..f2474cc 100644 --- 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.42.1.tar.gz -SOURCE_SUM=f5816e3f14acc52b78720e568417409cd8d1468b4c566a0b1117b861f0e036ed +SOURCE_URL=https://github.com/standardnotes/syncing-server-js/archive/1.42.6.tar.gz +SOURCE_SUM=4b7adcbffe4936e1676f21a4d42bf68a3299421429716b08dcbb545d3a047f37 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/manifest.json b/manifest.json index 629fc81..e103318 100644 --- 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.10.10~ynh1", + "version": "2021.10.29~ynh1", "url": "https://github.com/standardnotes/standalone", "upstream": { "license": "AGPL-3.0-or-later", diff --git a/scripts/_common.sh b/scripts/_common.sh index ec50cd0..c2238bb 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -6,9 +6,9 @@ RUBY_VERSION="2.7.3" NODEJS_VERSION="15.11.0" -syncing_server_js_version="1.42.1" -auth_version="1.22.1" -api_gateway_version="1.25.1" +syncing_server_js_version="1.42.6" +auth_version="1.24.2" +api_gateway_version="1.26.1" extensions_version="2021.08.27" swap_needed=2048 From 99ab3bc86aa7d1a32db6eec80663ca7ffa9ceb0e Mon Sep 17 00:00:00 2001 From: Yunohost-Bot <> Date: Fri, 29 Oct 2021 12:37:02 +0000 Subject: [PATCH 2/3] 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 12ecb19..a791974 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 syncing server. An end-to-end encrypted note-taking app. -**Shipped version:** 2021.10.10~ynh1 +**Shipped version:** 2021.10.29~ynh1 **Demo:** https://standardnotes.org/demo diff --git a/README_fr.md b/README_fr.md index c7320f4..4c2c8eb 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 :** 2021.10.10~ynh1 +**Version incluse :** 2021.10.29~ynh1 **Démo :** https://standardnotes.org/demo From 62e9e411a7aafcd306769600ab2fb9a50254b533 Mon Sep 17 00:00:00 2001 From: Fabian Wilkens Date: Sat, 30 Oct 2021 09:59:53 +0200 Subject: [PATCH 3/3] Fix: install / upgrade script issues --- scripts/install | 2 -- scripts/upgrade | 12 ++++++++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/scripts/install b/scripts/install index 9369b3d..349068d 100755 --- a/scripts/install +++ b/scripts/install @@ -119,9 +119,7 @@ ynh_script_progression --message="Setting up source files..." --weight=2 # Download, check integrity, uncompress and patch the source from app.src mkdir -p "$final_path/live" ynh_setup_source --source_id=app_syncing-server-js --dest_dir="$final_path/live/syncing-server-js" -ynh_setup_source --source_id=app_syncing-server-js --dest_dir="$final_path/live/syncing-server-js-worker" ynh_setup_source --source_id=app_auth --dest_dir="$final_path/live/auth" -ynh_setup_source --source_id=app_auth --dest_dir="$final_path/live/auth-worker" ynh_setup_source --source_id=app_api-gateway --dest_dir="$final_path/live/api-gateway" chmod 750 "$final_path" diff --git a/scripts/upgrade b/scripts/upgrade index a253da2..dbc3ad9 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -267,6 +267,14 @@ then ynh_remove_app_dependencies fi +# Remove unneeded data +if [ -e "$final_path/live/syncing-server-js-worker" ]; then + ynh_secure_remove --file="$final_path/live/syncing-server-js-worker" +fi +if [ -e "$final_path/live/auth-worker" ]; then + ynh_secure_remove --file="$final_path/live/auth-worker" +fi + #================================================= # CREATE DEDICATED USER #================================================= @@ -293,7 +301,7 @@ then ynh_backup_if_checksum_is_different --file=$config_syncing_server_js ynh_backup_if_checksum_is_different --file=$config_syncing_server_js_worker # Remove destination directory - ynh_secure_remove --file="$final_path/live/syncing_server_js" + ynh_secure_remove --file="$final_path/live/syncing-server-js" ynh_secure_remove --file="$config_syncing_server_js" ynh_secure_remove --file="$config_syncing_server_js_worker" # Download, check integrity, uncompress and patch the source from app.src @@ -320,7 +328,7 @@ then # Backup files to keep ynh_backup_if_checksum_is_different --file=$config_api_gateway # Remove destination directory - ynh_secure_remove --file="$final_path/live/api_gateway" + ynh_secure_remove --file="$final_path/live/api-gateway" ynh_secure_remove --file="$config_api_gateway" # Download, check integrity, uncompress and patch the source from app.src mkdir -p "$final_path/live"