From 5e4c3fdd39da693ea8b6cbf507aa77f5e35a9849 Mon Sep 17 00:00:00 2001 From: Chris Vogel Date: Wed, 15 May 2024 13:30:26 +0200 Subject: [PATCH] small corrections during backup/restore tests --- scripts/backup | 6 +----- scripts/remove | 4 ++-- scripts/restore | 2 +- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/scripts/backup b/scripts/backup index 2bd5042..337c00f 100755 --- a/scripts/backup +++ b/scripts/backup @@ -15,9 +15,8 @@ ynh_backup --src_path="${flohmarkt_log_dir}" # for the following backups we'll want to stop flohmarkt and couchdb # to guarentee a consistant state -ynh_print_info --message="Stopping flohmarkt and couchdb to backup data..." +ynh_print_info --message="Stopping flohmarkt to backup data..." flohmarkt_ynh_stop_service -flohmarkt_ynh_stop_couchdb # https://codeberg.org/ChriChri/flohmarkt_ynh/issues/24 # since this might be re-installed as a dependency during 'remove' and @@ -30,9 +29,6 @@ flohmarkt_ynh_stop_couchdb # ynh_backup --src_path="$data_dir" --is_big ynh_backup --src_path="$flohmarkt_data_dir" -ynh_print_info --message="Starting couchdb..." -flohmarkt_ynh_start_couchdb - ynh_print_info --message="Dumping couchdb..." flohmarkt_ynh_dump_couchdb diff --git a/scripts/remove b/scripts/remove index a3aadce..a56f99f 100755 --- a/scripts/remove +++ b/scripts/remove @@ -63,8 +63,8 @@ ynh_script_progression --message="Removing data directory..." --weight=2 ynh_remove_systemd_config # remove symlinks -ynh_secure_remove "$flohmarkt_sym_install" -ynh_secure_remove "$flohmarkt_sym_data_dir" +ynh_secure_remove --file="$flohmarkt_sym_install" +ynh_secure_remove --file="$flohmarkt_sym_data_dir" #================================================= # END OF SCRIPT diff --git a/scripts/restore b/scripts/restore index 9c15abd..55bdaba 100755 --- a/scripts/restore +++ b/scripts/restore @@ -33,7 +33,7 @@ ynh_restore_file --origin_path="$flohmarkt_install" # RESTORE THE DATA DIRECTORY ynh_script_progression --message="Restoring the data directory..." --weight=1 -ynh_restore_file --origin_path="$flohmarkt_data_dir=" --not_mandatory +ynh_restore_file --origin_path="$flohmarkt_data_dir" --not_mandatory mkdir -p $data_dir # restore logfiles