# Trap C-c and kill
trap die SIGINT SIGTERM
-# Don't start if we're already running
+# Don't start if we're already running. Don't use diemsg, as that removes the lock file!
if [ -e $LOCKFILE ]; then
- diemsg "$LOCKFILE exists for pid `cat $LOCKFILE`."
+ warnmsg "$LOCKFILE exists for pid `cat $LOCKFILE`."
+ exit 1
fi;
touch $LOCKFILE
echo $$ > $LOCKFILE
# 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"
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
# 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 -n 19 ionice -c3 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
# 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
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
# - 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"
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
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
| 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
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
# 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
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