1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/nodered_ynh.git synced 2024-09-03 19:46:25 +02:00

Merge branch 'testing' into ci-auto-update-3.1.5

This commit is contained in:
OniriCorpe 2024-02-24 02:25:47 +01:00 committed by GitHub
commit 85acfa21fb
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
9 changed files with 21 additions and 15 deletions

View file

@ -1,5 +1,5 @@
<!-- <!--
N.B.: This README was automatically generated by https://github.com/YunoHost/apps/tree/master/tools/README-generator N.B.: This README was automatically generated by https://github.com/YunoHost/apps/tree/master/tools/readme_generator
It shall NOT be edited by hand. It shall NOT be edited by hand.
--> -->

View file

@ -1,5 +1,5 @@
<!-- <!--
N.B.: This README was automatically generated by https://github.com/YunoHost/apps/tree/master/tools/README-generator N.B.: This README was automatically generated by https://github.com/YunoHost/apps/tree/master/tools/readme_generator
It shall NOT be edited by hand. It shall NOT be edited by hand.
--> -->

View file

@ -11,6 +11,9 @@ location ^~ __PATH__/ {
proxy_set_header Upgrade $http_upgrade; proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection "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 SSOWAT user panel.
include conf.d/yunohost_panel.conf.inc; include conf.d/yunohost_panel.conf.inc;
} }

View file

@ -48,10 +48,11 @@ ram.runtime = "70M"
[resources] [resources]
[resources.sources.main] [resources.sources.main]
url = "https://github.com/node-red/node-red/archive/refs/tags/3.1.5.tar.gz" url = "https://github.com/node-red/node-red/releases/download/3.1.5/node-red-3.1.5.zip"
sha256 = "9ace97d3cf6b0be8420f9bdcc33f2c4b3d14ef09626ab0be8fdfdb9213cf3d32" sha256 = "441c17d5a5bf6e19e2ea9eec3bc1e9af572230c47eee518c2dbb2e7374137f06"
autoupdate.strategy = "latest_github_release" autoupdate.strategy = "latest_github_release"
autoupdate.asset = "node-red-.*zip"
[resources.system_user] [resources.system_user]

View file

@ -4,7 +4,7 @@
# COMMON VARIABLES # COMMON VARIABLES
#================================================= #=================================================
nodejs_version=16 nodejs_version=20
#================================================= #=================================================
# PERSONAL HELPERS # PERSONAL HELPERS

View file

@ -16,7 +16,7 @@ source /usr/share/yunohost/helpers
#================================================= #=================================================
ynh_script_progression --message="Stopping a systemd service..." --weight=1 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 # MODIFY URL IN NGINX CONF

View file

@ -26,7 +26,7 @@ ynh_restore_file --origin_path="$install_dir"
chmod 750 "$install_dir" chmod 750 "$install_dir"
chmod -R o-rwx "$install_dir" chmod -R o-rwx "$install_dir"
chown -R $app: "$install_dir" chown -R "$app:" "$install_dir"
#================================================= #=================================================
# RESTORE SYSTEM CONFIGURATIONS # RESTORE SYSTEM CONFIGURATIONS

View file

@ -16,7 +16,7 @@ source /usr/share/yunohost/helpers
#================================================= #=================================================
ynh_script_progression --message="Stopping a systemd service..." --weight=1 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 # ENSURE DOWNWARD COMPATIBILITY
@ -44,7 +44,7 @@ fi
# In older versions of the package, the port serving the webui was opened to anyone, # 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. # allowing direct access to Node-RED... let's close it.
if yunohost firewall list | grep -q "\- $port$"; then 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 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_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 # END OF SCRIPT

View file

@ -4,10 +4,12 @@ test_format = 1.0
[default] [default]
# ------------------------
# ------------------------------- # -------------------------------
# Commits to test upgrade from # Commits to test upgrade from
# ------------------------------- # -------------------------------
[default.test_upgrade_from.3dae97a7] [default.test_upgrade_from.3dae97a7]
name = "3.0.2~ynh2" name = "3.0.2~ynh2"
[default.test_upgrade_from.ca5545af]
name = "3.1.4~ynh1 (update nodejs 16 to 20)"