diff --git a/README.md b/README.md index 70e6f8c..e8616e2 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in Very light weight open sources home automation system that lets you monitor and configure miscellaneous devices -**Shipped version:** 2020.2~ynh4 +**Shipped version:** 2020.2~ynh5 ## Disclaimers / important information Domoticz is a Home Automation system design to control various devices and receive input from various sensors. diff --git a/README_fr.md b/README_fr.md index 3076a1c..62fb704 100644 --- a/README_fr.md +++ b/README_fr.md @@ -17,7 +17,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour Logiciel open sources et gratuit de domotique qui vous permet de configurer un grand nombre d'appareils -**Version incluse :** 2020.2~ynh4 +**Version incluse :** 2020.2~ynh5 ## Avertissements / informations importantes Domoticz est un système de domotique permettant de controler différents objets et de recevoir des données de divers senseurs diff --git a/manifest.json b/manifest.json index f2e0fb9..88d9854 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Very light weight open sources home automation system that lets you monitor and configure miscellaneous devices", "fr": "Logiciel open sources et gratuit de domotique qui vous permet de configurer un grand nombre d'appareils" }, - "version": "2020.2~ynh4", + "version": "2020.2~ynh5", "url": "https://www.domoticz.com", "upstream": { "license": "GPL-3.0-or-later", diff --git a/scripts/install b/scripts/install index 5aacdcf..4f9a215 100755 --- a/scripts/install +++ b/scripts/install @@ -206,7 +206,7 @@ mkdir -p /var/log/"$app" chown -R domoticz: /var/log/"$app" # Use logrotate to manage application logfile(s) -ynh_use_logrotate +ynh_use_logrotate --logfile="/var/log/$app/$app" [[ ! -z "$mqtt_domain" ]] && ynh_use_logrotate --logfile="/var/log/mosquitto/" #================================================= @@ -243,9 +243,9 @@ then ynh_permission_update --permission="main" --add="visitors" fi -#API & MQTT should stay publicly accessible. -ynh_permission_create --permission="domoticz_API" --url="$domain$api_path" --allowed="visitors" -[[ ! -z "$mqtt_domain" ]] && ynh_permission_create --permission="domoticz_MQTT" --url="$mqtt_domain" --allowed="visitors" +#API & MQTT should stay publicly accessible. +ynh_permission_create --permission="domoticz_API" --label="api" --url="$domain$api_path" --allowed="visitors" --show_tile="false" --protected="true" +[[ ! -z "$mqtt_domain" ]] && ynh_permission_create --permission="domoticz_MQTT" --label="MQTT" --url="$mqtt_domain" --allowed="visitors" --show_tile="false" --protected="true" #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index 58bc0ea..e6cb037 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -134,7 +134,8 @@ fi if ! ynh_permission_exists --permission="domoticz_API" then # API Authorization with dedicated URL - ynh_permission_create --permission="domoticz_API" --url="$domain$api_path" --allowed="visitors" + ynh_permission_create --permission="domoticz_API" --label="api" --url="$domain$api_path" --allowed="visitors" --show_tile="false" --protected="true" + fi # Create the permission "domoticz_MQTT" only if it doesn't exist. @@ -142,7 +143,7 @@ if [ ! -z "$mqtt_domain" ]; then if ! ynh_permission_exists --permission="domoticz_MQTT" then # API Authorization with dedicated URL - ynh_permission_create --permission="domoticz_MQTT" --url="$mqtt_domain" --allowed="visitors" + ynh_permission_create --permission="domoticz_MQTT" --label="MQTT" --url="$mqtt_domain" --allowed="visitors" --show_tile="false" --protected="true" fi fi @@ -259,7 +260,7 @@ mkdir -p /var/log/"$app" chown -R domoticz: /var/log/"$app" # Use logrotate to manage app-specific logfile(s) -ynh_use_logrotate --non-append +ynh_use_logrotate --logfile="/var/log/$app/$app" --non-append [[ ! -z "$mqtt_domain" ]] && ynh_use_logrotate --logfile="/var/log/mosquitto/" --non-append