X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=bin%2Fbackup-script;h=a235190c3038a67f6941965e1099ee98443cfc24;hb=8c3a0b5d4fcd67eef6c601d7a012a10de489c32b;hp=4107e2425a614c2441fb9c2f1b96e2fb5368f0f1;hpb=8c9d5d34b1fe1a4affbf54b8699bf2735fbf72b9;p=backup-script.git

diff --git a/bin/backup-script b/bin/backup-script
index 4107e24..a235190 100755
--- a/bin/backup-script
+++ b/bin/backup-script
@@ -23,6 +23,7 @@ declare -i count_all=0
 declare -i count_started=0
 declare -i count_ok=0
 declare -i count_ok_vanished=0
+declare -i count_enabled=0
 
 destinations=""
 
@@ -30,6 +31,7 @@ destinations=""
 [ -d "/usr/local/etc/backup-script.d" ] \
 	&& conf_d="/usr/local/etc/backup-script.d" \
 	|| conf_d="/etc/backup-script.d"
+setup_exec=""
 pre_exec=""
 post_exec=""
 default_backup_type="rsync"
@@ -45,6 +47,7 @@ default_compress=1
 default_ping=1
 default_local=0
 default_generations=0
+default_io_timeout="1800"
 default_job_pre_exec=""
 default_job_post_exec=""
 default_tags=""
@@ -58,6 +61,7 @@ Usage() {
 	echo
 	echo "When no <system> is given, all defined systems are used."
 	echo
+	# shellcheck disable=SC2086
 	echo -e $config_info
 	echo
 	exit 2
@@ -77,7 +81,7 @@ CleanUp() {
 
 GotSignal() {
 	echo
-	echo "--> Got break signal, cleaning up & aborting ..."
+	echo "--> Got signal, cleaning up & aborting ..."
 	echo
 	CleanUp
 	echo -n "Aborted: "; date
@@ -231,6 +235,7 @@ Initialize_Last_SysTarget_Snapshot() {
 	case "$fs" in
 	  "btrfs")
 		# Search directory of last generation, if any
+		# shellcheck disable=SC2012
 		last=$(ls -1d "$sys_target"/[0-9]* 2>/dev/null | sort -r | head -n1)
 		if [ -n "$last" ]; then
 			if [ ! -d "$last" ]; then
@@ -281,6 +286,7 @@ done
 # Read in configuration file
 config_info="Configuration file is \"$conf\""
 if [ -r "$conf" ]; then
+	# shellcheck source=/dev/null
 	source "$conf"
 else
 	config_info="${config_info} (not readable, using defaults)"
@@ -326,20 +332,32 @@ echo "Rsync command is $rsync, protocol version $rsync_proto."
 [[ -n "$TAG" ]] && echo "Running jobs tagged with \"$TAG\"."
 echo
 
-trap GotSignal SIGINT
-
 if [ $# -ge 1 ]; then
 	for s in "$@"; do
 		if [ ! -r "${conf_d}/$s" ]; then
 			echo "$NAME: Can' read \"${conf_d}/$s\"!"
 			exit 3
 		fi
-		sys="$sys ${conf_d}/$s"
+		sys+=("${conf_d}/$s")
 	done
 else
-	sys="${conf_d}/"*
+	sys=("${conf_d}/"*)
+fi
+
+if [ -n "$setup_exec" ]; then
+	echo "Executing \"$setup_exec\" ..."
+	sh -c $setup_exec
+	if [ $? -ne 0 ]; then
+		echo "Error: setup command failed!"; echo
+		echo "Aborting backup."; echo
+		exit 5
+	fi
+	sleep 2
+	echo
 fi
 
+trap GotSignal SIGINT SIGTERM
+
 # check and create PID file
 if [ -e "$PIDFILE" ]; then
 	echo "Lockfile \"$PIDFILE\" already exists."
@@ -370,7 +388,7 @@ if [ -n "$pre_exec" ]; then
 	echo
 fi
 
-for f in $sys; do
+for f in "${sys[@]}"; do
 	[[ -r "$f" && -f "$f" ]] || continue
 
 	fname=$(basename "$f")
@@ -398,6 +416,7 @@ for f in $sys; do
 	job_pre_exec="$default_job_pre_exec"
 	job_post_exec="$default_job_post_exec"
 	tags="$default_tags"
+	io_timeout="$default_io_timeout"
 
 	# Compatibility with backup-pull(1) script: Save global values ...
 	pre_exec_saved="$pre_exec"
@@ -410,6 +429,7 @@ for f in $sys; do
 	unset post_exec
 
 	# Read in system configuration file
+	# shellcheck source=/dev/null
 	source "$f"
 
 	# Compatibility with backup-pull(1) script: Fix up configuration
@@ -449,12 +469,12 @@ for f in $sys; do
 		fi
 	fi
 
-	# Make sure "source" ends with a slash ("/")
-	case "$source" in
-	  "*/")
+	# Make sure "source_root" ends with a slash ("/")
+	case "$source_root" in
+	  *"/")
 		;;
-	  "*")
-		source="$source/"
+	  *)
+		source_root="$source_root/"
 	esac
 
 	# Make sure "target" DOESN'T end with a slash ("/")
@@ -473,6 +493,14 @@ for f in $sys; do
 
 	count_all=$count_all+1
 
+	# Check if job is disabled
+	if [ "$backup_type" = "disabled" ]; then
+		echo "Job is DISABLED and will be skipped."
+		echo; continue
+	fi
+
+	count_enabled=$count_enabled+1
+
 	# Check target directory
 	if [ -z "$target" ]; then
 		echo "No target directory specified for \"$system\"!? Skipped!"
@@ -569,10 +597,10 @@ for f in $sys; do
 
 	# prepare (remote) command ...
 	if [[ "$backup_type" == "rsync" ]]; then
-		cmd="$rsync --archive"
+		cmd="$rsync --archive --timeout=$io_timeout"
 		[ "$compress" -ne 0 ] && cmd="$cmd --compress"
 		[ "$local" -eq 0 ] && cmd="$cmd --rsh=\"$ssh_cmd\""
-		cmd="$cmd --delete --delete-excluded --sparse"
+		cmd="$cmd --delete-during --delete-excluded --sparse"
 		if [ "$VERBOSE" -gt 0 ]; then
 			[ "$rsync_proto" -ge 31 ] \
 				&& cmd="$cmd --info=progress2" \
@@ -632,12 +660,14 @@ for f in $sys; do
 		$SHELL -c "$cmd"; ret=$?
 		end_t=$(date "+%s")
 
-		echo "code=$ret" >"$stamp_file"
-		echo "start_t=$start_t" >>"$stamp_file"
-		echo "end_t=$end_t" >>"$stamp_file"
-		echo "cmd='$cmd'" >>"$stamp_file"
-		echo "backup_host='`hostname -f`'" >>"$stamp_file"
-		echo "backup_user='`id -un`'" >>"$stamp_file"
+		{
+			echo "code=$ret"
+			echo "start_t=$start_t"
+			echo "end_t=$end_t"
+			echo "cmd='$cmd'"
+			echo "backup_host='$(hostname -f)'"
+			echo "backup_user='$(id -un)'"
+		} >"$stamp_file"
 	else
 		echo " *** Trial run, not executing save command!"
 		ret=0
@@ -672,6 +702,7 @@ for f in $sys; do
 		fi
 		# Clean up old generations
 		declare -i gen_count=$generations+2
+		# shellcheck disable=SC2012
 		to_delete=$(ls -1t "$sys_root" 2>/dev/null | tail -n+$gen_count | sort)
 		if [[ -n "$to_delete" && $ok -eq 1 ]]; then
 			[ "$DRYRUN" -eq 0 ] \
@@ -685,6 +716,7 @@ for f in $sys; do
 				fi
 				last=$(stat "$dir/.stamp" 2>/dev/null | grep "^Modify: " \
 				 | cut -d':' -f2- | cut -d. -f1)
+				# shellcheck disable=SC2086
 				echo "Removing backup from" $last "..."
 				if [ "$DRYRUN" -eq 0 ]; then
 					DeleteSubvolume "$dir"
@@ -709,6 +741,7 @@ sync
 if [ "$DRYRUN" -eq 0 ]; then
 	paths=""
 	paths_zfs=""
+	# shellcheck disable=SC2086
 	for dest in $(echo $destinations | sed -e 's/ /\n/g' | sort | uniq); do
 		fs=$(GetFS "$dest")
 		case $fs in
@@ -720,10 +753,12 @@ if [ "$DRYRUN" -eq 0 ]; then
 		esac
 	done
 	if [ -n "$paths" ]; then
+		# shellcheck disable=SC2086
 		df -h $paths
 		echo
 	fi
 	if [ -n "$paths_zfs" ]; then
+		# shellcheck disable=SC2086
 		zfs list $paths_zfs
 		echo
 	fi
@@ -734,7 +769,9 @@ CleanUp
 echo -n "Done: "; date
 echo
 [ $count_all -eq 1 ] && s="" || s="s"
-echo " - $count_all job$s defined,"
+[ $count_enabled -eq $count_all ] \
+	&& echo " - $count_all job$s defined (all enabled)," \
+	|| echo " - $count_all job$s defined ($count_enabled enabled),"
 [ $count_started -eq 1 ] && s="" || s="s"
 echo " - $count_started job$s started,"
 echo " - $count_ok done without errors."
@@ -744,7 +781,7 @@ if [ $count_started -ne $count_ok ]; then
 	echo "----->  THERE HAVE BEEN ERRORS!  <-----"
 	echo
 	exit 6
-elif [ $count_all -ne $count_started ]; then
+elif [ $count_enabled -ne $count_started ]; then
 	exit 7
 fi