YunoHost-Apps/domoticz_ynh
1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/domoticz_ynh.git synced 2024-09-03 18:26:17 +02:00
Code Issues Activity Actions

Merge pull request from YunoHost-Apps/testing

Browse source 
update logrotate and api label
This commit is contained in:
Krakinou 2022-11-19 16:51:55 +01:00 • committed by GitHub
commit d8d3b18e23
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 11 additions and 10 deletions

2
README.md
View file

@ -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 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 ## Disclaimers / important information
Domoticz is a Home Automation system design to control various devices and receive input from various sensors. Domoticz is a Home Automation system design to control various devices and receive input from various sensors.

2
README_fr.md
View file

@ -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 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 ## 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 Domoticz est un système de domotique permettant de controler différents objets et de recevoir des données de divers senseurs

2
manifest.json
View file

@ -6,7 +6,7 @@
"en": "Very light weight open sources home automation system that lets you monitor and configure miscellaneous devices", "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" "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", "url": "https://www.domoticz.com",
"upstream": { "upstream": {
"license": "GPL-3.0-or-later", "license": "GPL-3.0-or-later",

8
scripts/install
View file

@ -206,7 +206,7 @@ mkdir -p /var/log/"$app"
chown -R domoticz: /var/log/"$app" chown -R domoticz: /var/log/"$app"
# Use logrotate to manage application logfile(s) # 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/" [[ ! -z "$mqtt_domain" ]] && ynh_use_logrotate --logfile="/var/log/mosquitto/"
#================================================= #=================================================
@ -243,9 +243,9 @@ then
ynh_permission_update --permission="main" --add="visitors" ynh_permission_update --permission="main" --add="visitors"
fi fi
#API & MQTT should stay publicly accessible. #API & MQTT should stay publicly accessible.
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"
[[ ! -z "$mqtt_domain" ]] && ynh_permission_create --permission="domoticz_MQTT" --url="$mqtt_domain" --allowed="visitors" [[ ! -z "$mqtt_domain" ]] && ynh_permission_create --permission="domoticz_MQTT" --label="MQTT" --url="$mqtt_domain" --allowed="visitors" --show_tile="false" --protected="true"
#================================================= #=================================================

7
scripts/upgrade
View file

@ -134,7 +134,8 @@ fi
if ! ynh_permission_exists --permission="domoticz_API" if ! ynh_permission_exists --permission="domoticz_API"
then then
# API Authorization with dedicated URL # 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 fi
# Create the permission "domoticz_MQTT" only if it doesn't exist. # 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" if ! ynh_permission_exists --permission="domoticz_MQTT"
then then
# API Authorization with dedicated URL # 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
fi fi
@ -259,7 +260,7 @@ mkdir -p /var/log/"$app"
chown -R domoticz: /var/log/"$app" chown -R domoticz: /var/log/"$app"
# Use logrotate to manage app-specific logfile(s) # 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 [[ ! -z "$mqtt_domain" ]] && ynh_use_logrotate --logfile="/var/log/mosquitto/" --non-append