diff --git a/README.md b/README.md index 2181800..87157d6 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ @@ -73,4 +73,4 @@ or sudo yunohost app upgrade nodered -u https://github.com/YunoHost-Apps/nodered_ynh/tree/testing --debug ``` -**More info regarding app packaging:** +**More info regarding app packaging:** \ No newline at end of file diff --git a/README_fr.md b/README_fr.md index aa29a31..9c154ae 100644 --- a/README_fr.md +++ b/README_fr.md @@ -1,5 +1,5 @@ diff --git a/conf/nginx.conf b/conf/nginx.conf index 9ac97f6..02d4d9e 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -11,6 +11,9 @@ location ^~ __PATH__/ { proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection "Upgrade"; + # Enable websockets (see: https://github.com/YunoHost-Apps/nodered_ynh/issues/78 ) + more_set_headers "Content-Security-Policy : upgrade-insecure-requests; default-src https: data: blob: ; connect-src 'self' wss://$host; object-src https: data: 'unsafe-inline'; style-src https: data: 'unsafe-inline' ; script-src https: data: 'unsafe-inline' 'unsafe-eval'; worker-src 'self' blob:;"; + # Include SSOWAT user panel. include conf.d/yunohost_panel.conf.inc; } diff --git a/manifest.toml b/manifest.toml index 3b74bfb..2a158cf 100644 --- a/manifest.toml +++ b/manifest.toml @@ -48,10 +48,11 @@ ram.runtime = "70M" [resources] [resources.sources.main] - url = "https://github.com/node-red/node-red/archive/refs/tags/3.1.5.tar.gz" - sha256 = "9ace97d3cf6b0be8420f9bdcc33f2c4b3d14ef09626ab0be8fdfdb9213cf3d32" + url = "https://github.com/node-red/node-red/releases/download/3.1.5/node-red-3.1.5.zip" + sha256 = "441c17d5a5bf6e19e2ea9eec3bc1e9af572230c47eee518c2dbb2e7374137f06" autoupdate.strategy = "latest_github_release" + autoupdate.asset = "node-red-.*zip" [resources.system_user] diff --git a/scripts/_common.sh b/scripts/_common.sh index b818f0f..44277c5 100755 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -4,7 +4,7 @@ # COMMON VARIABLES #================================================= -nodejs_version=16 +nodejs_version=20 #================================================= # PERSONAL HELPERS diff --git a/scripts/change_url b/scripts/change_url index 45029e7..ef11966 100755 --- a/scripts/change_url +++ b/scripts/change_url @@ -16,7 +16,7 @@ source /usr/share/yunohost/helpers #================================================= ynh_script_progression --message="Stopping a systemd service..." --weight=1 -ynh_systemd_action --service_name=$app --action="stop" --log_path="/var/log/$app/$app.log" +ynh_systemd_action --service_name="$app" --action="stop" --log_path="/var/log/$app/$app.log" #================================================= # MODIFY URL IN NGINX CONF diff --git a/scripts/restore b/scripts/restore index 93e81a7..58545e4 100755 --- a/scripts/restore +++ b/scripts/restore @@ -26,7 +26,7 @@ ynh_restore_file --origin_path="$install_dir" chmod 750 "$install_dir" chmod -R o-rwx "$install_dir" -chown -R $app: "$install_dir" +chown -R "$app:" "$install_dir" #================================================= # RESTORE SYSTEM CONFIGURATIONS diff --git a/scripts/upgrade b/scripts/upgrade index f11b86c..3febcdd 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -16,7 +16,7 @@ source /usr/share/yunohost/helpers #================================================= ynh_script_progression --message="Stopping a systemd service..." --weight=1 -ynh_systemd_action --service_name=$app --action="stop" +ynh_systemd_action --service_name="$app" --action="stop" #================================================= # ENSURE DOWNWARD COMPATIBILITY @@ -44,7 +44,7 @@ fi # In older versions of the package, the port serving the webui was opened to anyone, # allowing direct access to Node-RED... let's close it. if yunohost firewall list | grep -q "\- $port$"; then - ynh_exec_warn_less yunohost firewall disallow TCP $port + ynh_exec_warn_less yunohost firewall disallow TCP "$port" fi #================================================= @@ -117,7 +117,7 @@ yunohost service add "$app" --description="Low-code programming for event-driven #================================================= ynh_script_progression --message="Starting a systemd service..." --weight=3 -ynh_systemd_action --service_name=$app --action="start" +ynh_systemd_action --service_name="$app" --action="start" #================================================= # END OF SCRIPT diff --git a/tests.toml b/tests.toml index 724c9b5..c97f408 100644 --- a/tests.toml +++ b/tests.toml @@ -4,10 +4,12 @@ test_format = 1.0 [default] - # ------------------------ - # ------------------------------- - # Commits to test upgrade from - # ------------------------------- +# ------------------------------- +# Commits to test upgrade from +# ------------------------------- [default.test_upgrade_from.3dae97a7] name = "3.0.2~ynh2" + + [default.test_upgrade_from.ca5545af] + name = "3.1.4~ynh1 (update nodejs 16 to 20)"