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

Merge pull request #21 from YunoHost-Apps/fix-restore

Browse source 
Fix restore
This commit is contained in:
ewilly 2021-01-18 09:15:20 +00:00 committed by GitHub
commit 274c123284
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
check_process
View file

@ -17,7 +17,7 @@
multi_instance=0 multi_instance=0
port_already_use=1 port_already_use=1
change_url=1 change_url=1
actions=1 actions=0
config_panel=0 config_panel=0
;;; Options ;;; Options
Notification=all Notification=all

2
conf/homeassistant_conf_files/bin/ynh_ldap-auth.sh
View file

@ -48,7 +48,7 @@ log() {
# Check permission of ynh user. # Check permission of ynh user.
ynh_user_app_permission() { ynh_user_app_permission() {
access=$(cat "/etc/ssowat/conf.json" | jq 'def IN(s): . as $in | first(if (s == $in) then true else empty end) ; .permissions["homeassistant.main"].users as $f | '\"$username\"' | IN($f[])') access=$(cat "/etc/ssowat/conf.json" | jq ".permissions.\"homeassistant.main\".users | index(\"$username\")")
[ ! -z "$access" ] && return 1 [ ! -z "$access" ] && return 1
return 0 return 0
} }

6
scripts/backup
View file

@ -16,17 +16,17 @@ domain=$(ynh_app_setting_get --app="$app" --key=domain)
final_path="/opt/yunohost/$app" final_path="/opt/yunohost/$app"
home_path="/home/$app" home_path="/home/$app"
ynh_script_progression --message="Storing the python version in settings..." ynh_print_info --message="Storing the python version in settings..."
# store python version # store python version
python=$(cat "$final_path/bin/python3" --version | cut -d ' ' -f 2) python=$(cat "$final_path/bin/python3" --version | cut -d ' ' -f 2)
ynh_app_setting_set --app="$app" --key=python --value="$python" ynh_app_setting_set --app="$app" --key=python --value="$python"
# backup source & conf files # backup source & conf files
ynh_script_progression --message="Backuping the app, datas & ystem files..." ynh_print_info --message="Declaring files to be backed up..."
ynh_backup --src_path="$final_path" ynh_backup --src_path="$final_path"
ynh_backup --src_path="$home_path" ynh_backup --src_path="$home_path"
ynh_backup --src_path="/etc/nginx/conf.d/$domain.d/$app.conf" ynh_backup --src_path="/etc/nginx/conf.d/$domain.d/$app.conf"
ynh_backup --src_path="/etc/sudoers.d/$app" ynh_backup --src_path="/etc/sudoers.d/$app"
ynh_backup --src_path="/etc/systemd/system/$app@$app.service" ynh_backup --src_path="/etc/systemd/system/$app@$app.service"
ynh_script_progression --message="Backup of $app completed" --last ynh_print_info --message="Backup of $app completed"

2
scripts/restore
View file

@ -66,7 +66,7 @@ ynh_systemd_action --service_name="$app@$app" --action=start --line_match="Home
# remove --verbose from service and restart # remove --verbose from service and restart
ynh_replace_string --match_string=" --verbose" --replace_string="" --target_file="/etc/systemd/system/$app@$app.service" ynh_replace_string --match_string=" --verbose" --replace_string="" --target_file="/etc/systemd/system/$app@$app.service"
systemctl daemon-reload systemctl daemon-reload
ynh_systemd_action --service_name="$app@$app" --action=restart ynh_systemd_action --service_name="$app@$app" --action=restart --line_match="Started Home Assistant" --log_path="systemd" --timeout=3600
ynh_script_progression --message="Restoring nginx web server..." ynh_script_progression --message="Restoring nginx web server..."
ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf" ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf"