diff --git a/.github/workflows/updater.yml b/.github/workflows/updater.yml index ea4e74f..d9d9426 100644 --- a/.github/workflows/updater.yml +++ b/.github/workflows/updater.yml @@ -8,7 +8,7 @@ on: workflow_dispatch: # Run it every day at 6:00 UTC schedule: - - cron: '0 6 * * *' + - cron: '0 6 * * 1' jobs: updater: runs-on: ubuntu-latest diff --git a/README.md b/README.md index f05739e..0996ca8 100644 --- a/README.md +++ b/README.md @@ -17,22 +17,20 @@ 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.09.09~ynh1 +**Shipped version:** 2021.10.29~ynh1 **Demo:** https://standardnotes.org/demo ## Disclaimers / important information -* Any known limitations, constrains or stuff not working, such as (but not limited to): - * No single-sign on or LDAP integration - * Ram requirements (Swap memory will be created during install): - * The app requires at least 800MB of RAM to work properly. - * The app requires at least 1000MB of RAM to start. - * The app requires at least 1500MB of RAM to install. +* No single-sign on or LDAP integration +* Ram requirements (Swap memory will be created during install): + * The app requires at least 800MB of RAM to work properly. + * The app requires at least 1000MB of RAM to start. + * The app requires at least 1500MB of RAM to install. -* Other infos that people should be aware of, such as: - * The ".env" config-files are stored under "/opt/yunohost/$app/live/" - * You can change the url of this app, but than all useres have to reinstall the extensions. +* The ".env" config-files are stored under "/opt/yunohost/$app/live/" +* You can change the url of this app, but than all useres have to reinstall the extensions. ## Documentation and resources diff --git a/README_fr.md b/README_fr.md index 5b32313..58cedc2 100644 --- a/README_fr.md +++ b/README_fr.md @@ -13,22 +13,20 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour -**Version incluse :** 2021.09.09~ynh1 +**Version incluse :** 2021.10.29~ynh1 **Démo :** https://standardnotes.org/demo ## Avertissements / informations importantes -* Any known limitations, constrains or stuff not working, such as (but not limited to): - * No single-sign on or LDAP integration - * Ram requirements (Swap memory will be created during install): - * The app requires at least 800MB of RAM to work properly. - * The app requires at least 1000MB of RAM to start. - * The app requires at least 1500MB of RAM to install. +* No single-sign on or LDAP integration +* Ram requirements (Swap memory will be created during install): + * The app requires at least 800MB of RAM to work properly. + * The app requires at least 1000MB of RAM to start. + * The app requires at least 1500MB of RAM to install. -* Other infos that people should be aware of, such as: - * The ".env" config-files are stored under "/opt/yunohost/$app/live/" - * You can change the url of this app, but than all useres have to reinstall the extensions. +* The ".env" config-files are stored under "/opt/yunohost/$app/live/" +* You can change the url of this app, but than all useres have to reinstall the extensions. ## Documentations et ressources diff --git a/check_process b/check_process index b6d90c3..7747d38 100644 --- a/check_process +++ b/check_process @@ -15,9 +15,9 @@ setup_private=0 setup_public=1 upgrade=1 - # 2021.07.24~yhn3 - upgrade=1 from_commit=426dd68db71fda8aa61269928bd991c0f17feb3f - # 3.22.8~yhn2 + # 2021.09.09~yhn1 + upgrade=1 from_commit=855bdcb966cf396a62edb2f1e17e7351642bbf50 + # 3.22.8~yhn2 ( Old Server version based on Ruby ) upgrade=1 from_commit=b0c7e9e6f16d286ec74fa3c1b9cdf8492f4dcb9b backup_restore=1 multi_instance=1 @@ -27,7 +27,8 @@ Email= Notification= ;;; Upgrade options + ; commit=855bdcb966cf396a62edb2f1e17e7351642bbf50 + name=2021.09.09~ynh1 ; commit=b0c7e9e6f16d286ec74fa3c1b9cdf8492f4dcb9b name=3.22.8~ynh2 - manifest_arg=domain=DOMAIN&path=PATH=1 diff --git a/conf/app_api-gateway.src b/conf/app_api-gateway.src index 2605514..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.0.tar.gz -SOURCE_SUM=B83FF5C2C642070F7A06DD77B657935C3EBCCF8E287F9BD7A6C4069E7106E47B +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 1862f11..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.19.1.tar.gz -SOURCE_SUM=A25F9B57E6D03725C739A41891D85224CC1218534DAA3F2213803703FE8A7D67 +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 8d5ee9e..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.39.0.tar.gz -SOURCE_SUM=4B320DE63D388356B2B5576784FA2F8A49D0C44419FF73495C9997CC92F7E294 +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/doc/DISCLAIMER.md b/doc/DISCLAIMER.md index 4a9f0a3..fd48474 100644 --- a/doc/DISCLAIMER.md +++ b/doc/DISCLAIMER.md @@ -1,10 +1,8 @@ -* Any known limitations, constrains or stuff not working, such as (but not limited to): - * No single-sign on or LDAP integration - * Ram requirements (Swap memory will be created during install): - * The app requires at least 800MB of RAM to work properly. - * The app requires at least 1000MB of RAM to start. - * The app requires at least 1500MB of RAM to install. +* No single-sign on or LDAP integration +* Ram requirements (Swap memory will be created during install): + * The app requires at least 800MB of RAM to work properly. + * The app requires at least 1000MB of RAM to start. + * The app requires at least 1500MB of RAM to install. -* Other infos that people should be aware of, such as: - * The ".env" config-files are stored under "/opt/yunohost/$app/live/" - * You can change the url of this app, but than all useres have to reinstall the extensions. +* The ".env" config-files are stored under "/opt/yunohost/$app/live/" +* You can change the url of this app, but than all useres have to reinstall the extensions. diff --git a/manifest.json b/manifest.json index 639065a..e103318 100644 --- a/manifest.json +++ b/manifest.json @@ -5,9 +5,9 @@ "description": { "en": "The Standard Notes syncing server. An end-to-end encrypted note-taking app." }, - "version": "2021.09.09~ynh1", + "version": "2021.10.29~ynh1", "url": "https://github.com/standardnotes/standalone", - "upstream": { + "upstream": { "license": "AGPL-3.0-or-later", "website": "https://standardnotes.org/", "demo": "https://standardnotes.org/demo", @@ -29,7 +29,7 @@ "mysql" ], "arguments": { - "install" : [ + "install": [ { "name": "domain", "type": "domain" diff --git a/scripts/_common.sh b/scripts/_common.sh index e675e4b..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.39.0" -auth_version="1.19.1" -api_gateway_version="1.25.0" +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 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"