From 333c9a04aed73377804cfa152fc9845aeeb9c869 Mon Sep 17 00:00:00 2001 From: tituspijean Date: Tue, 17 Nov 2020 22:22:32 +0100 Subject: [PATCH 1/8] Upgrade to 1.2.4 --- README.md | 2 +- README_fr.md | 2 +- conf/app.src | 4 ++-- manifest.json | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index b6125dc..228cd40 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ If you don't have YunoHost, please see [here](https://yunohost.org/#/install) to ## Overview Flow-based programming for the Internet of Things. -**Shipped version:** 1.2.3 +**Shipped version:** 1.2.4 ## Screenshots diff --git a/README_fr.md b/README_fr.md index d977608..ad83a1d 100644 --- a/README_fr.md +++ b/README_fr.md @@ -11,7 +11,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour ## Vue d'ensemble Programmation par flux de données pour l'Internet des objets. -**Version incluse :** 1.2.3 +**Version incluse :** 1.2.4 ## Captures d'écran diff --git a/conf/app.src b/conf/app.src index 7203522..15a2186 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/node-red/node-red/releases/download/1.2.3/node-red-1.2.3.zip -SOURCE_SUM=4DC8468E0B3F5D25E011CE131757F97713E6739E96F44541BD1E33891848D667 +SOURCE_URL=https://github.com/node-red/node-red/releases/download/1.2.4/node-red-1.2.4.zip +SOURCE_SUM=4F2533CE91AE446FECA7BAE16B9E11ED6211A093CA2569164F6B309EEA710409 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=zip SOURCE_IN_SUBDIR=true diff --git a/manifest.json b/manifest.json index 98e3e34..bfcbb2f 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Flow-based programming for the Internet of Things.", "fr": "Programmation par flux de données pour l'Internet des objets." }, - "version": "1.2.3~ynh1", + "version": "1.2.4~ynh1", "url": "https://nodered.org", "license": "Apache-2.0", "maintainer": { From b24086d4dd19699702cd1640dca52cea50b0d798 Mon Sep 17 00:00:00 2001 From: tituspijean Date: Tue, 17 Nov 2020 23:28:17 +0100 Subject: [PATCH 2/8] Still store is_public --- scripts/install | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/install b/scripts/install index b567f40..8fcbcb0 100755 --- a/scripts/install +++ b/scripts/install @@ -43,6 +43,7 @@ ynh_script_progression --message="Storing installation settings..." --weight=1 ynh_app_setting_set --app=$app --key=domain --value=$domain ynh_app_setting_set --app=$app --key=path --value=$path_url +ynh_app_setting_set --app=$app --key=is_public --value=$is_public #================================================= # STANDARD MODIFICATIONS From 383c48dd084a9c170cb0a06019f6df4d5d918817 Mon Sep 17 00:00:00 2001 From: tituspijean Date: Wed, 18 Nov 2020 08:40:19 +0100 Subject: [PATCH 3/8] Upgrade to 1.2.5 --- README.md | 2 +- README_fr.md | 2 +- conf/app.src | 4 ++-- manifest.json | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 228cd40..951bef6 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ If you don't have YunoHost, please see [here](https://yunohost.org/#/install) to ## Overview Flow-based programming for the Internet of Things. -**Shipped version:** 1.2.4 +**Shipped version:** 1.2.5 ## Screenshots diff --git a/README_fr.md b/README_fr.md index ad83a1d..047d2d9 100644 --- a/README_fr.md +++ b/README_fr.md @@ -11,7 +11,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour ## Vue d'ensemble Programmation par flux de données pour l'Internet des objets. -**Version incluse :** 1.2.4 +**Version incluse :** 1.2.5 ## Captures d'écran diff --git a/conf/app.src b/conf/app.src index 15a2186..6db9aa9 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/node-red/node-red/releases/download/1.2.4/node-red-1.2.4.zip -SOURCE_SUM=4F2533CE91AE446FECA7BAE16B9E11ED6211A093CA2569164F6B309EEA710409 +SOURCE_URL=https://github.com/node-red/node-red/releases/download/1.2.5/node-red-1.2.5.zip +SOURCE_SUM=B0FEBDA494E9AD558896076B3BDF4CF582083C8A104FDE39D0E67532B78586C8 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=zip SOURCE_IN_SUBDIR=true diff --git a/manifest.json b/manifest.json index bfcbb2f..2b59e31 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Flow-based programming for the Internet of Things.", "fr": "Programmation par flux de données pour l'Internet des objets." }, - "version": "1.2.4~ynh1", + "version": "1.2.5~ynh1", "url": "https://nodered.org", "license": "Apache-2.0", "maintainer": { From 17d1396f95854f28965fb73bdef689df3b4eb89d Mon Sep 17 00:00:00 2001 From: tituspijean Date: Thu, 26 Nov 2020 18:17:06 +0100 Subject: [PATCH 4/8] Upgrade to 1.2.6 --- README.md | 2 +- README_fr.md | 2 +- conf/app.src | 4 ++-- manifest.json | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 951bef6..4f3a88c 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ If you don't have YunoHost, please see [here](https://yunohost.org/#/install) to ## Overview Flow-based programming for the Internet of Things. -**Shipped version:** 1.2.5 +**Shipped version:** 1.2.6 ## Screenshots diff --git a/README_fr.md b/README_fr.md index 047d2d9..56ecb11 100644 --- a/README_fr.md +++ b/README_fr.md @@ -11,7 +11,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour ## Vue d'ensemble Programmation par flux de données pour l'Internet des objets. -**Version incluse :** 1.2.5 +**Version incluse :** 1.2.6 ## Captures d'écran diff --git a/conf/app.src b/conf/app.src index 6db9aa9..504a443 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/node-red/node-red/releases/download/1.2.5/node-red-1.2.5.zip -SOURCE_SUM=B0FEBDA494E9AD558896076B3BDF4CF582083C8A104FDE39D0E67532B78586C8 +SOURCE_URL=https://github.com/node-red/node-red/releases/download/1.2.6/node-red-1.2.6.zip +SOURCE_SUM=AE0F11D02CF3FC9E2EDBA47FA0CE038D477766304C802F05C22359A0CE9ECD3B SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=zip SOURCE_IN_SUBDIR=true diff --git a/manifest.json b/manifest.json index 2b59e31..e331ceb 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Flow-based programming for the Internet of Things.", "fr": "Programmation par flux de données pour l'Internet des objets." }, - "version": "1.2.5~ynh1", + "version": "1.2.6~ynh1", "url": "https://nodered.org", "license": "Apache-2.0", "maintainer": { From c039c412e39982a4209715c11683c66c343c64b5 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Mon, 7 Dec 2020 09:50:58 +0100 Subject: [PATCH 5/8] Fix linter warnings --- check_process | 14 -------------- scripts/install | 2 +- scripts/restore | 4 ++-- scripts/upgrade | 6 ++++++ 4 files changed, 9 insertions(+), 17 deletions(-) diff --git a/check_process b/check_process index 2e295be..e9defde 100644 --- a/check_process +++ b/check_process @@ -24,20 +24,6 @@ incorrect_path=1 port_already_use=1 change_url=1 -;;; Levels - Level 1=auto - Level 2=auto - Level 3=auto -# Level 4: If the app supports LDAP and SSOwat, turn level 4 to '1' and add a link to an issue or a part of your code to show it. -# If the app does not use LDAP nor SSOwat, and can't use them, turn level 4 to 'na' and explain as well. -# na: no user management - Level 4=na - Level 5=auto - Level 6=auto - Level 7=auto - Level 8=0 - Level 9=0 - Level 10=0 ;;; Options Email= Notification=none diff --git a/scripts/install b/scripts/install index 8fcbcb0..7103454 100755 --- a/scripts/install +++ b/scripts/install @@ -141,7 +141,7 @@ ynh_use_logrotate # ADVERTISE SERVICE IN ADMIN PANEL #================================================= -yunohost service add $app --log "/var/log/$app/$app.log" +yunohost service add $app --log="/var/log/$app/$app.log" #================================================= # START SYSTEMD SERVICE diff --git a/scripts/restore b/scripts/restore index d327049..52a73ac 100755 --- a/scripts/restore +++ b/scripts/restore @@ -81,13 +81,13 @@ ynh_install_nodejs $nodejs_version ynh_script_progression --message="Restoring the systemd configuration..." --weight=1 ynh_restore_file --origin_path="/etc/systemd/system/$app.service" -systemctl enable $app.service +systemctl enable $app.service --quiet #================================================= # ADVERTISE SERVICE IN ADMIN PANEL #================================================= -yunohost service add $app --log "/var/log/$app/$app.log" +yunohost service add $app --log="/var/log/$app/$app.log" #================================================= # START SYSTEMD SERVICE diff --git a/scripts/upgrade b/scripts/upgrade index 2b9e7d6..200dc0b 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -169,6 +169,12 @@ ynh_add_systemd_config # Set permissions on app files chown -R $app: $final_path +#================================================= +# ADVERTISE SERVICE IN ADMIN PANEL +#================================================= + +yunohost service add $app --log="/var/log/$app/$app.log" + #================================================= # SETUP SSOWAT #================================================= From c62a8153bf92ba0c82a5a2404a90403a5eb7be7e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sun, 27 Dec 2020 13:33:29 +0100 Subject: [PATCH 6/8] Set SVG badge --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 4f3a88c..0b7a596 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # Node-RED for YunoHost [![Integration level](https://dash.yunohost.org/integration/nodered.svg)](https://dash.yunohost.org/appci/app/nodered) ![](https://ci-apps.yunohost.org/ci/badges/nodered.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/nodered.maintain.svg) -[![Install nodered with YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=nodered) +[![Install nodered with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=nodered) *[Lire ce readme en français.](./README_fr.md)* From b43e6f2b1edfcedca284a7c39ba52f46db8db115 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sun, 27 Dec 2020 13:34:08 +0100 Subject: [PATCH 7/8] Set SVG badge --- README_fr.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README_fr.md b/README_fr.md index 56ecb11..eb64634 100644 --- a/README_fr.md +++ b/README_fr.md @@ -1,7 +1,7 @@ # Node-RED pour YunoHost [![Integration level](https://dash.yunohost.org/integration/nodered.svg)](https://dash.yunohost.org/appci/app/nodered) ![](https://ci-apps.yunohost.org/ci/badges/nodered.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/nodered.maintain.svg) -[![Install Node-RED with YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=nodered) +[![Install Node-RED with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=nodered) *[Read this readme in english.](./README.md)* From b027db74273b865617855936d8370019c2bf927b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Fri, 8 Jan 2021 23:12:27 +0100 Subject: [PATCH 8/8] 1.2.7 (#18) --- README.md | 2 +- README_fr.md | 2 +- check_process | 1 - conf/app.src | 4 ++-- manifest.json | 8 ++++---- scripts/_common.sh | 1 + scripts/install | 7 +++---- scripts/remove | 10 ---------- scripts/restore | 2 +- scripts/upgrade | 14 +------------- 10 files changed, 14 insertions(+), 37 deletions(-) diff --git a/README.md b/README.md index 0b7a596..0607ae6 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ If you don't have YunoHost, please see [here](https://yunohost.org/#/install) to ## Overview Flow-based programming for the Internet of Things. -**Shipped version:** 1.2.6 +**Shipped version:** 1.2.7 ## Screenshots diff --git a/README_fr.md b/README_fr.md index eb64634..b1b6854 100644 --- a/README_fr.md +++ b/README_fr.md @@ -11,7 +11,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour ## Vue d'ensemble Programmation par flux de données pour l'Internet des objets. -**Version incluse :** 1.2.6 +**Version incluse :** 1.2.7 ## Captures d'écran diff --git a/check_process b/check_process index e9defde..f7b2c22 100644 --- a/check_process +++ b/check_process @@ -21,7 +21,6 @@ upgrade=0 from_commit=567fc9435804add272fa4ae48a7cf1ec5f173d2d backup_restore=1 multi_instance=1 - incorrect_path=1 port_already_use=1 change_url=1 ;;; Options diff --git a/conf/app.src b/conf/app.src index 504a443..93231bf 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/node-red/node-red/releases/download/1.2.6/node-red-1.2.6.zip -SOURCE_SUM=AE0F11D02CF3FC9E2EDBA47FA0CE038D477766304C802F05C22359A0CE9ECD3B +SOURCE_URL=https://github.com/node-red/node-red/releases/download/1.2.7/node-red-1.2.7.zip +SOURCE_SUM=d0e47c5c618a733a5cfc650f6226a7013b1e8dd8e4d2291ad3dc03991ac74834 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=zip SOURCE_IN_SUBDIR=true diff --git a/manifest.json b/manifest.json index e331ceb..fdf25b0 100644 --- a/manifest.json +++ b/manifest.json @@ -3,10 +3,10 @@ "id": "nodered", "packaging_format": 1, "description": { - "en": "Flow-based programming for the Internet of Things.", - "fr": "Programmation par flux de données pour l'Internet des objets." + "en": "Flow-based programming for the Internet of Things", + "fr": "Programmation par flux de données pour l'Internet des objets" }, - "version": "1.2.6~ynh1", + "version": "1.2.7~ynh1", "url": "https://nodered.org", "license": "Apache-2.0", "maintainer": { @@ -14,7 +14,7 @@ "email": "tituspijean@outlook.com" }, "requirements": { - "yunohost": ">= 3.5" + "yunohost": ">= 3.8.1" }, "multi_instance": true, "services": [ diff --git a/scripts/_common.sh b/scripts/_common.sh index 17a4f57..2e030ac 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -3,6 +3,7 @@ #================================================= # COMMON VARIABLES #================================================= + nodejs_version=12 #================================================= diff --git a/scripts/install b/scripts/install index 7103454..2cbbf8f 100755 --- a/scripts/install +++ b/scripts/install @@ -141,7 +141,7 @@ ynh_use_logrotate # ADVERTISE SERVICE IN ADMIN PANEL #================================================= -yunohost service add $app --log="/var/log/$app/$app.log" +yunohost service add $app --description="Low-code programming for event-driven applications" --log="/var/log/$app/$app.log" #================================================= # START SYSTEMD SERVICE @@ -157,10 +157,9 @@ ynh_systemd_action --service_name=$app --action="start" --log_path="/var/log/$ap ynh_script_progression --message="Configuring SSOwat..." --weight=1 # Make app public if necessary -if [ $is_public -eq 1 ] +if [ $is_public -eq 0 ] then - # unprotected_uris allows SSO credentials to be passed anyway. - ynh_app_setting_set --app=$app --key=unprotected_uris --value="/" + ynh_permission_update --permission "main" --remove "visitors" fi #================================================= diff --git a/scripts/remove b/scripts/remove index 1cd634c..b482ca9 100755 --- a/scripts/remove +++ b/scripts/remove @@ -65,16 +65,6 @@ ynh_script_progression --message="Removing logrotate configuration..." --weight= # Remove the app-specific logrotate config ynh_remove_logrotate -#================================================= -# CLOSE A PORT -#================================================= - -if yunohost firewall list | grep -q "\- $port$" -then - ynh_script_progression --message="Closing port $port..." - ynh_exec_warn_less yunohost firewall disallow TCP $port -fi - #================================================= # SPECIFIC REMOVE #================================================= diff --git a/scripts/restore b/scripts/restore index 52a73ac..d3a48b2 100755 --- a/scripts/restore +++ b/scripts/restore @@ -87,7 +87,7 @@ systemctl enable $app.service --quiet # ADVERTISE SERVICE IN ADMIN PANEL #================================================= -yunohost service add $app --log="/var/log/$app/$app.log" +yunohost service add $app --description="Low-code programming for event-driven applications" --log="/var/log/$app/$app.log" #================================================= # START SYSTEMD SERVICE diff --git a/scripts/upgrade b/scripts/upgrade index 200dc0b..95070b3 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -173,19 +173,7 @@ chown -R $app: $final_path # ADVERTISE SERVICE IN ADMIN PANEL #================================================= -yunohost service add $app --log="/var/log/$app/$app.log" - -#================================================= -# SETUP SSOWAT -#================================================= -ynh_script_progression --message="Upgrading SSOwat configuration..." --weight=1 - -# Make app public if necessary -if [ $is_public -eq 1 ] -then - # unprotected_uris allows SSO credentials to be passed anyway - ynh_app_setting_set --app=$app --key=unprotected_uris --value="/" -fi +yunohost service add $app --description="Low-code programming for event-driven applications" --log="/var/log/$app/$app.log" #================================================= # START SYSTEMD SERVICE