X-Git-Url: https://arthur.barton.de/gitweb/?a=blobdiff_plain;f=bin%2Fbackup-script;h=9530410dee0e8d85b7e7b18ad9cefdba4d6cc00f;hb=05cbdc409dd5e4ef1c1d32dcaf15c6baa77e865d;hp=f585d42a815935277a386c5efe1ea6eb6e6626c0;hpb=62d13a08821610678998f401c3cf1b47634bf07c;p=backup-script.git

diff --git a/bin/backup-script b/bin/backup-script
index f585d42..9530410 100755
--- a/bin/backup-script
+++ b/bin/backup-script
@@ -16,6 +16,7 @@ PIDFILE="/var/run/$NAME.pid"
 DRYRUN=0
 VERBOSE=0
 TAG=""
+PREPOSTEXEC=1
 
 export LC_ALL=C
 
@@ -23,6 +24,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 +32,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,26 +48,29 @@ 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=""
 
 Usage() {
-	echo "Usage: $NAME [<options>] [<system> [<system> [...]]]"
+	echo "Usage: $NAME [<options>] [<job> [<job> [...]]]"
 	echo
 	echo "  -n, --dry-run       Test run only, don't copy any data."
 	echo "  -p, --progress      Show progress, see rsync(1)."
 	echo "  -t TAG, --tag TAG   Only run jobs with tag TAG."
+	echo "  -x, --no-exec       Don't run global pre-/post-exec commands."
 	echo
-	echo "When no <system> is given, all defined systems are used."
+	echo "When no <job> is given, all defined systems are used."
 	echo
+	# shellcheck disable=SC2086
 	echo -e $config_info
 	echo
 	exit 2
 }
 
 CleanUp() {
-	if [ -n "$post_exec" ]; then
+	if [[ -n "$pre_exec" && $PREPOSTEXEC -ne 0 ]]; then
 		echo "Executing \"$post_exec\" ..."
 		sh -c $post_exec
 		if [ $? -ne 0 ]; then
@@ -77,7 +83,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 +237,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
@@ -300,6 +307,9 @@ while [ $# -gt 0 ]; do
 		shift; TAG="$1"; shift
 		[ -n "$TAG" ] || Usage
 		;;
+	  "-x"|"--no-exec")
+		PREPOSTEXEC=0; shift
+		;;
 	  "-"*)
 		Usage
 		;;
@@ -327,8 +337,6 @@ 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
@@ -341,6 +349,20 @@ else
 	sys=("${conf_d}/"*)
 fi
 
+if [[ -n "$setup_exec" && $PREPOSTEXEC -ne 0 ]]; 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."
@@ -358,7 +380,7 @@ else
 	echo "$$" >>"$PIDFILE"
 fi
 
-if [ -n "$pre_exec" ]; then
+if [[ -n "$pre_exec" && $PREPOSTEXEC -ne 0 ]]; then
 	echo "Executing \"$pre_exec\" ..."
 	sh -c $pre_exec
 	if [ $? -ne 0 ]; then
@@ -399,6 +421,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"
@@ -475,6 +498,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!"
@@ -571,7 +602,7 @@ for f in "${sys[@]}"; do
 
 	# prepare (remote) command ...
 	if [[ "$backup_type" == "rsync" ]]; then
-		cmd="$rsync --archive --timeout=900"
+		cmd="$rsync --archive --timeout=$io_timeout"
 		[ "$compress" -ne 0 ] && cmd="$cmd --compress"
 		[ "$local" -eq 0 ] && cmd="$cmd --rsh=\"$ssh_cmd\""
 		cmd="$cmd --delete-during --delete-excluded --sparse"
@@ -634,12 +665,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
@@ -674,6 +707,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 ] \
@@ -687,6 +721,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"
@@ -711,6 +746,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
@@ -722,10 +758,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
@@ -736,7 +774,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."
@@ -746,7 +786,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