Merge pull request #57 from YunoHost-Apps/testing

2021.11.22~ynh1

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.11.08~ynh1
+**Shipped version:** 2021.11.22~ynh1
 
 **Demo:** https://standardnotes.org/demo
 

README_fr.md

@@ -13,7 +13,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour
 
 
 
-**Version incluse :** 2021.11.08~ynh1
+**Version incluse :** 2021.11.22~ynh1
 
 **Démo :** https://standardnotes.org/demo
 

conf/app_api-gateway.src

@@ -1,5 +1,5 @@
-SOURCE_URL=https://github.com/standardnotes/api-gateway/archive/1.26.1.tar.gz
+SOURCE_URL=https://github.com/standardnotes/api-gateway/archive/1.27.0.tar.gz
-SOURCE_SUM=3fe3ea593dc1feca708c35786bf140f8445d964a4503145d0aa268bf0091a337
+SOURCE_SUM=841e34d55f63c9ed7acfed60e5121248b2a5590eeadc65ab8a268306acf86366
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=tar.gz
 SOURCE_IN_SUBDIR=true

conf/app_auth.src

@@ -1,5 +1,5 @@
-SOURCE_URL=https://github.com/standardnotes/auth/archive/1.24.2.tar.gz
+SOURCE_URL=https://github.com/standardnotes/auth/archive/1.29.0.tar.gz
-SOURCE_SUM=8a38eb876a2b8c4b65309c7dd94df71817d8267e86377618a76964561ed7a45c
+SOURCE_SUM=3968d20f309292f8d0cc92f9eb648199945345789812ccce5594ade1267f24bf
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=tar.gz
 SOURCE_IN_SUBDIR=true

conf/app_syncing-server-js.src

@@ -1,5 +1,5 @@
-SOURCE_URL=https://github.com/standardnotes/syncing-server-js/archive/1.42.7.tar.gz
+SOURCE_URL=https://github.com/standardnotes/syncing-server-js/archive/1.42.9.tar.gz
-SOURCE_SUM=b9a3b457a4c46b39101a278ee71f3714b90c56d598dec6605d8a33e41a6862de
+SOURCE_SUM=709630a56e54abe6c356e1fb745def9ddefab255486f4bc3cb0473a73fe4ea90
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=tar.gz
 SOURCE_IN_SUBDIR=true

conf/nginx.conf

@@ -1,8 +1,4 @@
 location __PATH__/ {
-    if ($scheme = http) {
-        rewrite ^ https://$server_name$request_uri? permanent;
-    }
-
     proxy_pass http://127.0.0.1:__PORT_API_GATEWAY__/;
     proxy_http_version 1.1;
     proxy_set_header Host $http_host;
@@ -24,10 +20,6 @@ location = __PATH__/help {
 location __PATH__/help/ {
     alias __FINAL_PATH_WWW__/help/;
 
-    if ($scheme = http) {
-        rewrite ^ https://$server_name$request_uri? permanent;
-    }
-
     # Include SSOWAT user panel.
     include conf.d/yunohost_panel.conf.inc;
 }
@@ -44,10 +36,6 @@ location = __PATH__/extensions/ {
 location __PATH__/extensions/ {
     alias __FINAL_PATH_EXTENSIONS__/;
 
-    if ($scheme = http) {
-        rewrite ^ https://$server_name$request_uri? permanent;
-    }
-
     if ($request_method = 'OPTIONS') {
         more_set_headers 'Access-Control-Allow-Origin: $http_origin';
         more_set_headers 'Access-Control-Allow-Methods: GET, POST, OPTIONS, PUT, DELETE, HEAD';

manifest.json

@@ -5,7 +5,7 @@
     "description": {
         "en": "The Standard Notes syncing server. An end-to-end encrypted note-taking app."
     },
-    "version": "2021.11.08~ynh1",
+    "version": "2021.11.22~ynh1",
     "url": "https://github.com/standardnotes/standalone",
     "upstream": {
         "license": "AGPL-3.0-or-later",

scripts/_common.sh

@@ -4,11 +4,11 @@
 # COMMON VARIABLES
 #=================================================
 RUBY_VERSION="2.7.3"
-NODEJS_VERSION="15.11.0"
+NODEJS_VERSION="16"
 
-syncing_server_js_version="1.42.7"
+syncing_server_js_version="1.42.9"
-auth_version="1.24.2"
+auth_version="1.29.0"
-api_gateway_version="1.26.1"
+api_gateway_version="1.27.0"
 extensions_version="2021.08.27"
 
 swap_needed=2048

scripts/install

@@ -325,7 +325,7 @@ ynh_systemd_action \
     --service_name="$app-api-gateway" \
     --action="start" \
     --log_path="/var/log/$app/api-gateway.log" \
-    --line_match='{"message":"Server started on port '$port_api_gateway'","level":"info"}'
+    --line_match='{"level":"info","message":"Server started on port '$port_api_gateway'"}'
 
 #=================================================
 # SETUP FAIL2BAN

scripts/restore

@@ -226,7 +226,7 @@ ynh_systemd_action \
     --service_name="$app-api-gateway" \
     --action="start" \
     --log_path="/var/log/$app/api-gateway.log" \
-    --line_match='{"message":"Server started on port '$port_api_gateway'","level":"info"}'
+    --line_match='{"level":"info","message":"Server started on port '$port_api_gateway'"}'
 
 #=================================================
 # RESTORE THE LOGROTATE CONFIGURATION

scripts/upgrade

@@ -57,6 +57,7 @@ config_auth_worker="$final_path/live/auth-worker.env"
 config_api_gateway="$final_path/live/api-gateway.env"
 
 standalone=$(ynh_app_setting_get --app=$app --key=standalone)
+nodejs_version_installed=$(ynh_app_setting_get --app=$app --key=nodejs_version)
 
 #=================================================
 # CHECK VERSION
@@ -382,11 +383,16 @@ ynh_add_nginx_config
 #=================================================
 ynh_script_progression --message="Upgrading dependencies..." --weight=1
 
+# Remove old nodejs version
+if [[ "$nodejs_version_installed" < "$NODEJS_VERSION" && -n "$nodejs_version_installed" ]]
+then
+	ynh_remove_nodejs
+fi
+
 ynh_install_app_dependencies $pkg_dependencies
 ynh_install_nodejs --nodejs_version=$NODEJS_VERSION
 ynh_install_extra_app_dependencies --repo="deb https://dl.yarnpkg.com/debian/ stable main" --package="yarn" --key="https://dl.yarnpkg.com/debian/pubkey.gpg"
 
-
 #=================================================
 # SPECIFIC UPGRADE
 #=================================================
@@ -547,7 +553,7 @@ ynh_systemd_action \
     --service_name="$app-api-gateway" \
     --action="start" \
     --log_path="/var/log/$app/api-gateway.log" \
-    --line_match='{"message":"Server started on port '$port_api_gateway'","level":"info"}'
+    --line_match='{"level":"info","message":"Server started on port '$port_api_gateway'"}'
 
 #=================================================
 # SETUP FAIL2BAN