X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=backup.sh;h=71ebfe1084897fe525dd14091340d4c100a74ccb;hb=948635d7a45badaf24b8e66c54e92073234dab23;hp=f4ae98bb0ab7dde18f3aee1df337786472ed50ae;hpb=d3303892e4f393d994804016060a8bc704acfebb;p=backup.sh

diff --git a/backup.sh b/backup.sh
index f4ae98b..71ebfe1 100755
--- a/backup.sh
+++ b/backup.sh
@@ -90,7 +90,7 @@ backup()
 		# If incremental backup, we need to copy the incremental status to $computer.
 		# If it does not exist, whine a bit and then run date-based instead.
 		if [ -s "$localsnar" ]; then
-			if ! scp $localsnar $username@$computer:$remotesnar; then
+			if ! scp $localsnar $username@$computer:$remotesnar >&2; then
 				diemsg "Could not copy .incremental.snar to $computer"
 			fi
 			lastcmd="--listed-incremental=$remotesnar --no-check-device"
@@ -107,6 +107,16 @@ backup()
 		lastcmd="--listed-incremental=$remotesnar"
 	fi
 
+	# The file is usually stored to disk with a simple cat > $TARFILE,
+	# but in some cases, like backing up to a remote and untrusted
+	# file system, it could be useful to replace it with e.g.
+	# a GPG command line.
+	if [ -f $confdir/storageprogram.$computer ]; then
+		storageprogram=`cat $confdir/storageprogram.$computer`
+	else
+		storageprogram=cat
+	fi
+
 	# We try to run tar on the remote computer
 	#    c create archive
 	#    C change to directory first
@@ -118,8 +128,8 @@ backup()
 	#    Pipe the stuff over ssh to ourselves, run pee to cat the contents to a
 	#    file and build a file list, respectivly.  
 	TARFILE=$DATE.tmp
-	TARCMD="ssh $username@$computer \"nice -n 19 ionice -c3 tar --one-file-system --use-compress-program $compressor -cf - -C $filesystem . $lastcmd \
-		--exclude-from=$remotehome/.backup/exclude\" | pee \"cat > $TARFILE\" \"tar tzvf -\""
+	TARCMD="ssh -n $username@$computer \"$nice tar --one-file-system --use-compress-program $compressor -cf - -C $filesystem . $lastcmd \
+		--exclude-from=$remotehome/.backup/exclude\" | pee \"$storageprogram > $TARFILE\" \"tar tzvf -\""
 	infomsg "Running $TARCMD"
 	eval $TARCMD > $DATE.idx
 
@@ -127,7 +137,7 @@ backup()
 		# File is >0 in size and neither cat or tar tzvf failed; we assume it worked.
  
 		if [ "$remotesnar" ]; then
-			if ! scp $username@$computer:$remotesnar $localsnar.tmp; then
+			if ! scp $username@$computer:$remotesnar $localsnar.tmp >&2; then
 				diemsg "Could not copy .incremental.snar from $computer"
 			fi
 		fi
@@ -146,7 +156,7 @@ backup()
 		chmod 644 *idx 2>/dev/null          #everyone can read
 
 		# Let the remote computer know that we ran a successful backup (for nagios)
-		ssh $username@$computer touch $filesystem/.lastbackup
+		ssh -n $username@$computer touch $filesystem/.lastbackup
 	else
 		# Something wrong happened.
 		rm $TARFILE
@@ -161,6 +171,8 @@ backup()
 #  - No touching of .lastbackup for Nagios.
 #  - Failed tar operations may go undetected, since we only see the error code
 #    the last process in the pipe chain, which is gpg.
+#  - No storageprogram support (see above), because the file is typically already
+#    encrypted.
 nonprivbackup()
 {
 	infomsg "$computer:$filesystem $backuplevel non-privileged backup"
@@ -173,7 +185,7 @@ nonprivbackup()
 	fi
 
 	TARFILE=$DATE.tmp
-	TARCMD="ssh $username@$computer \"sudo /usr/local/sbin/output-encrypted-backup $filesystem $lastcmd\""
+	TARCMD="ssh -n $username@$computer \"sudo /usr/local/sbin/output-encrypted-backup $filesystem $lastcmd\""
 	infomsg "Running $TARCMD"
 	eval $TARCMD > $TARFILE
 
@@ -221,7 +233,7 @@ if ! ssh -n -o NumberOfPasswordPrompts=0 $username@$computer /bin/true; then
 fi
 
 # Find the home directory of the backup user
-remotehome=`ssh $username@$computer "echo ~"`
+remotehome=`ssh -n $username@$computer "echo ~"`
 if [ -z "$remotehome" ]; then
 	diemsg "Could not expand ~ for user $username"
 fi
@@ -234,6 +246,14 @@ else
 	compressor=gzip
 fi
 
+# Check if nice and ionice are available
+if ssh -n $username@$computer "nice -n 19 ionice -c3 /bin/true 2>/dev/null"; then
+	nice="nice -n 19 ionice -c3"
+else
+	infomsg "nice and/or ionice missing; will run at normal priority."
+	nice=""
+fi
+
 # Check dump bit in fstab
 filesystems=`ssh -n $username@$computer "cat /etc/fstab" \
 	| grep -v nfs \
@@ -242,12 +262,12 @@ filesystems=`ssh -n $username@$computer "cat /etc/fstab" \
 	| awk '{ if ( $(NF-1) != "0" ) print $2}' `
 
 # Clean up our dir at this client
-if ! ssh $username@$computer "rm -r $remotehome/.backup ; mkdir -m 700 $remotehome/.backup"; then
+if ! ssh -n $username@$computer "rm -r $remotehome/.backup ; mkdir -m 700 $remotehome/.backup"; then
 	diemsg "Could not create backup staging area at $computer:$remotehome/.backup"
 fi
 
 # Try to copy $exclude to $computer
-if ! scp $exclude $username@$computer:$remotehome/.backup/exclude > /dev/null; then
+if ! scp $exclude $username@$computer:$remotehome/.backup/exclude >&2; then
 	diemsg "Could not copy exclude.txt to $computer"
 fi
 
@@ -264,7 +284,7 @@ if [ -f $confdir/postexec.$computer ]; then
 fi
 
 # Try to run preexec if it exists
-if ! ssh $username@$computer "[ ! -f $remotehome/.backup/preexec ] || /bin/bash -x $remotehome/.backup/preexec" >&2; then
+if ! ssh -n $username@$computer "[ ! -f $remotehome/.backup/preexec ] || /bin/bash -x $remotehome/.backup/preexec" >&2; then
 	diemsg "Could not run $computer:$remotehome/.backup/preexec"
 fi
 
@@ -315,7 +335,7 @@ for filesystem in $filesystems; do
 
 	# Check if this box has a custom number of full backups
 	if [ -f $confdir/maksfulle.$computer.$sfilesystem ]; then
-		mf=$((`cat $confdir/maksfulle.$computer`+1))
+		mf=$((`cat $confdir/maksfulle.$computer.$sfilesystem`+1))
 	elif [ -f $confdir/maksfulle.$computer ] ; then
 		mf=$((`cat $confdir/maksfulle.$computer`+1))
 	else
@@ -340,7 +360,7 @@ for filesystem in $filesystems; do
 done
 
 # Try to run postexec if it exist
-if ! ssh $username@$computer "[ ! -f $remotehome/.backup/postexec ] || /bin/bash -x $remotehome/.backup/postexec" >&2; then
+if ! ssh -n $username@$computer "[ ! -f $remotehome/.backup/postexec ] || /bin/bash -x $remotehome/.backup/postexec" >&2; then
 	diemsg "Could not run $computer:$remotehome/.backup/postexec"
 fi