Merge pull request #19 from YunoHost-Apps/testing

Testing

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)*
 
@@ -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
 

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)*
 
@@ -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
 

check_process

@@ -21,23 +21,8 @@
 		upgrade=0	from_commit=567fc9435804add272fa4ae48a7cf1ec5f173d2d
 		backup_restore=1
 		multi_instance=1
-		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

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_URL=https://github.com/node-red/node-red/releases/download/1.2.7/node-red-1.2.7.zip
-SOURCE_SUM=AE0F11D02CF3FC9E2EDBA47FA0CE038D477766304C802F05C22359A0CE9ECD3B
+SOURCE_SUM=d0e47c5c618a733a5cfc650f6226a7013b1e8dd8e4d2291ad3dc03991ac74834
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=zip
 SOURCE_IN_SUBDIR=true

manifest.json

@@ -3,10 +3,10 @@
     "id": "nodered",
     "packaging_format": 1,
     "description": {
-        "en": "Flow-based programming for the Internet of Things.",
+        "en": "Flow-based programming for the Internet of Things",
-        "fr": "Programmation par flux de données pour l'Internet des objets."
+        "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": [

scripts/_common.sh

@@ -3,6 +3,7 @@
 #=================================================
 # COMMON VARIABLES
 #=================================================
+
 nodejs_version=12
 
 #=================================================

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_permission_update --permission "main" --remove "visitors"
-	ynh_app_setting_set --app=$app --key=unprotected_uris --value="/"
 fi
 
 #=================================================

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
 #=================================================

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 --description="Low-code programming for event-driven applications" --log="/var/log/$app/$app.log"
 
 #=================================================
 # START SYSTEMD SERVICE

scripts/upgrade

@@ -170,16 +170,10 @@ ynh_add_systemd_config
 chown -R $app: $final_path
 
 #=================================================
-# SETUP SSOWAT
+# ADVERTISE SERVICE IN ADMIN PANEL
 #=================================================
-ynh_script_progression --message="Upgrading SSOwat configuration..." --weight=1
 
-# Make app public if necessary
+yunohost service add $app --description="Low-code programming for event-driven applications" --log="/var/log/$app/$app.log"
-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
 
 #=================================================
 # START SYSTEMD SERVICE