X-Git-Url: https://codewiz.org/gitweb?p=wizbackup.git;a=blobdiff_plain;f=wizbackup;h=f857379346de4bb5e38bace10e2d9e14c05e9598;hp=034651a997fd3747d17f4c4c257ed3bda82796df;hb=1d1badd9b0d11377529245d2a6198865d08cc6b0;hpb=188a17dc90f321be843f2f577023f3a2720afa50

diff --git a/wizbackup b/wizbackup
index 034651a..f857379 100755
--- a/wizbackup
+++ b/wizbackup
@@ -1,15 +1,24 @@
 #!/bin/bash
 #
-# wizbackup 2.0 - Simple rsync backup
+# WizBackup 2.0 - Simple rsync backup
 # Based on incremental-backup 0.1 by Matteo Mattei
 #
 # Copyright 2006 Matteo Mattei <matteo.mattei@gmail.com>
 # Copyright 2007, 2008, 2009, 2010, 2011 Bernie Innocenti <bernie@codewiz.org>
 #
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License,
-# or (at your option) any later version.
+#  This program is free software: you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation, either version 3 of the License,
+#  or (at your option) any later version.
+#
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
 
 
 if [ $# -lt 2 ]; then
@@ -17,8 +26,8 @@ if [ $# -lt 2 ]; then
 	exit 1
 fi
 
-# Fail on any error; Treat undefined variables as errors
-set -e -u
+# Treat undefined variables as errors
+set -u
 
 #####################################################################
 # CONFIGURATION
@@ -32,21 +41,21 @@ DEST=$1; shift
 
 # NOTE: --timeout needs to be large enough: if a large dir tree don't change a lot of time can pass without I/O
 # NOTE: --inplace will clobber linked files in older snapshots. DON'T USE IT!
-RSYNC_OPTIONS="-HAXa --stats --timeout 1800 --numeric-ids --delete --delete-excluded --ignore-errors $@"
-# NUMBER OF SAVED ARCHIVES
-N_SNAPSHOT=45
-RESULT=500
+RSYNC_OPTS="-HAXa --stats --timeout 1800 --numeric-ids --delete --delete-excluded --ignore-errors $@"
 
+# Number of saved snapshots
+SNAPSHOTS=45
+
+RESULT=500
 DATE=`date +"%Y%m%d"`
 DEST="`echo $DEST | sed -e 's/\/$//'`"
 
 
 # Use "backup" ssh key with ssh protocol, or password file for rsync protocol
 if [ "${SRC%:*}" == "rsync" ]; then
-	RSYNC_PWD="--password-file=/etc/wizbackup.pwd --contimeout 10"
+	RSYNC_OPTS="$RSYNC_OPTS --password-file=/etc/wizbackup/rsync_password --contimeout 10"
 else
-	export RSYNC_RSH="ssh -i /root/.ssh/id_backup -c arcfour -x -o VerifyHostKeyDNS=yes"
-	RSYNC_PWD=""
+	export RSYNC_RSH="ssh -i /etc/wizbackup/ssh_id -c arcfour -x -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no"
 fi
 
 # Error tolerant grep
@@ -59,8 +68,8 @@ tgrep()
 do_backup()
 {
 	set -o pipefail
-	echo "$(date): Starting rsync: rsync $RSYNC_PWD $RSYNC_OPTIONS $SRC $DEST/$DATE/"
-	rsync $RSYNC_PWD $RSYNC_OPTIONS "$SRC" "$DEST/tmp/" 2>&1 | tgrep -v -E 'vanished|some files'
+	echo "$(date): rsync $RSYNC_OPTS $SRC $DEST/tmp/"
+	rsync $RSYNC_OPTS "$SRC" "$DEST/tmp/" 2>&1 | tgrep -v -E 'vanished|some files'
 	RESULT=$?
 	case "$RESULT" in
 	0|24)
@@ -98,7 +107,7 @@ do_init()
 
 do_prune()
 {
-	local old="`ls | grep -v tmp | head -n -$N_SNAPSHOT`"
+	local old="`ls | grep -v tmp | head -n -$SNAPSHOTS`"
 	if [ ! -z "$old" ]; then
 		echo "$(date): Removing oldest snapshot(s): $old..."
 		rm -rf "$old" || exit 669
@@ -108,24 +117,32 @@ do_prune()
 do_link()
 {
 	local newest=`ls | grep  -v tmp | tail -n 1`
-	if [ -z "$newest" ]; then
+	if [ -d "$DEST/tmp" ]; then
+		echo "$(date): Continuing with pre-existing snapshot $DEST/tmp"
+	elif [ -z "$newest" ]; then
 		echo "$(date): No previous snapshot found, performing a full backup!"
-	elif [ -d "$DEST/tmp" ]; then
-		echo "$(date): Continuing with preexisting snapshot $DEST/tmp"
 	else
 		echo "$(date): Linking snapshot $DEST/$newest to $DEST/tmp"
 		# TODO: Creating the hardlinks takes a lot of time.
 		# Perhaps we could save time by recycling the oldest snapshot
-		cp -lR "$DEST/$newest" "$DEST/tmp" || exit 670
+		cp -lR "$DEST/$newest" "$DEST/tmp"
+		RESULT=$?
+		if [ $RESULT -ne 0 ]; then
+			echo "$(date): Failed to setup tmp snapshot: $RESULT. Cleaning up."
+			rm -rf "$DEST/tmp"
+			exit $RESULT
+		fi
 	fi
 }
 
 do_test()
 {
+	# TODO: test for free space and free inodes in the $DEST filesystem
+
 	# Avoid clobbering the latest snapshot if the remote host does
 	# not allow us to connect
 	# --contimeout: sometimes hangs on connection...
-	rsync $RSYNC_PWD $RSYNC_OPTIONS --dry-run --no-recursive "$SRC" >/dev/null
+	rsync $RSYNC_OPTS --dry-run --no-recursive "$SRC" >/dev/null
 	RESULT=$?
 	if [ $RESULT -ne 0 ]; then
 		echo "$(date): rsync test failed: $RESULT.  Aborting."