infomsg "$computer:$filesystem $backuplevel backup"
localsnar="${storagedir}/${computer}/${sfilesystem}/.incremental.snar"
- remotesnar="/root/.backup/${sfilesystem}.snar"
+ remotesnar="$remotehome/.backup/${sfilesystem}.snar"
if [ "$backuplevel" = "daglig" ]; then
# 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 root@$computer:$remotesnar; then
+ if ! scp $localsnar $username@$computer:$remotesnar; then
diemsg "Could not copy .incremental.snar to $computer"
fi
lastcmd="--listed-incremental=$remotesnar --no-check-device"
# 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 root@$computer \"nice -n 19 ionice -c3 tar --one-file-system --use-compress-program $compressor -cf - -C $filesystem . $lastcmd \
- --exclude-from=/root/.backup/exclude\" | pee \"cat > $TARFILE\" \"tar tzvf -\""
+ 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 -\""
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 root@$computer:$remotesnar $localsnar.tmp; then
+ if ! scp $username@$computer:$remotesnar $localsnar.tmp; 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 root@$computer touch $filesystem/.lastbackup
+ ssh $username@$computer touch $filesystem/.lastbackup
+ else
+ # Something wrong happened.
+ rm $TARFILE
+ diemsg "tar failed or $TARFILE empty. $backuplevel backup of $computer:$filesystem failed and deleted"
+ fi
+}
+
+# Non-privileged backups currently have a few limitations compared to regular ones:
+#
+# - No .idx files.
+# - No .snar-style incremental backups, only date-based.
+# - No touching of .lastbackup for Nagios.
+nonprivbackup()
+{
+ infomsg "$computer:$filesystem $backuplevel non-privileged backup"
+
+ if [ "$backuplevel" = "daglig" ]; then
+ lastd=`cat ../.date`
+ lastcmd="\"$lastd\""
+ else
+ lastcmd=""
+ fi
+
+ TARFILE=$DATE.tmp
+ TARCMD="ssh $username@$computer \"sudo /usr/local/sbin/output-encrypted-backup $filesystem $lastcmd\""
+ infomsg "Running $TARCMD"
+ eval $TARCMD > $TARFILE
+
+ if [ $? -lt 2 ] && [ -s $TARFILE ]; then
+ # File is >0 in size and the remote tar did not report any fatal errors; we assume it worked.
+
+ # Move tar file in place
+ mv $TARFILE $DATE.tgz.gpg
+
+ # Update timestamp
+ echo $DATEs > ../.date && touch -t $DATE ../.date
+
+ # Fix permissions
+ chmod 600 *tgz.gpg #only for us
else
# Something wrong happened.
rm $TARFILE
if [ "$rootfilesystem" == "$targetfilesystem" ]; then
diemsg "Target filesystem ($storagedir/$computer) was mounted on /."
fi
+
+# Find the user to do the backup as.
+if [ -f $confdir/username.$computer ] ; then
+ username=`cat $confdir/username.$computer`
+else
+ username=root
+fi
infomsg "Backing up $computer"
# Try to SSH to the computer without entering a password.
-if ! ssh -n -o NumberOfPasswordPrompts=0 root@$computer /bin/true; then
+if ! ssh -n -o NumberOfPasswordPrompts=0 $username@$computer /bin/true; then
diemsg "Could not use passwordless SSH."
fi
+# Find the home directory of the backup user
+remotehome=`ssh $username@$computer "echo ~"`
+if [ -z "$remotehome" ]; then
+ diemsg "Could not expand ~ for user $username"
+fi
+
# Check if pigz is available
-if ssh -n root@$computer "pigz -V 2>/dev/null"; then
+if ssh -n $username@$computer "pigz -V 2>/dev/null"; then
compressor=pigz
else
infomsg "pigz missing; falling back to gzip."
fi
# Check dump bit in fstab
-filesystems=`ssh -n root@$computer "cat /etc/fstab" \
+filesystems=`ssh -n $username@$computer "cat /etc/fstab" \
| grep -v nfs \
| grep -v "^#" \
| grep -v "^$" \
| awk '{ if ( $(NF-1) != "0" ) print $2}' `
# Clean up our dir at this client
-if ! ssh root@$computer "rm -r /root/.backup ; mkdir -m 700 /root/.backup"; then
- diemsg "Could not create backup staging area at $computer:/root/.backup"
+if ! ssh $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 root@$computer:/root/.backup/exclude > /dev/null; then
+if ! scp $exclude $username@$computer:$remotehome/.backup/exclude > /dev/null; then
diemsg "Could not copy exclude.txt to $computer"
fi
# Try to copy preeexec and postexec if they exist
if [ -f $confdir/preexec.$computer ]; then
- if ! scp $confdir/preexec.$computer root@$computer:/root/.backup/preexec >&2; then
- diemsg "Could not copy preexec.$computer to $computer:/root/.backup/preexec"
+ if ! scp $confdir/preexec.$computer $username@$computer:$remotehome/.backup/preexec >&2; then
+ diemsg "Could not copy preexec.$computer to $computer:$remotehome/.backup/preexec"
fi
fi
if [ -f $confdir/postexec.$computer ]; then
- if ! scp $confdir/postexec.$computer root@$computer:/root/.backup/postexec >&2; then
- diemsg "Could not copy postexec.$computer to $computer:/root/.backup/postexec"
+ if ! scp $confdir/postexec.$computer $username@$computer:$remotehome/.backup/postexec >&2; then
+ diemsg "Could not copy postexec.$computer to $computer:$remotehome/.backup/postexec"
fi
fi
# Try to run preexec if it exists
-if ! ssh root@$computer "[ ! -f /root/.backup/preexec ] || /bin/bash -x /root/.backup/preexec" >&2; then
- diemsg "Could not run $computer:/root/.backup/preexec"
+if ! ssh $username@$computer "[ ! -f $remotehome/.backup/preexec ] || /bin/bash -x $remotehome/.backup/preexec" >&2; then
+ diemsg "Could not run $computer:$remotehome/.backup/preexec"
fi
for filesystem in $filesystems; do
fullbackup_min_for_this_machine=$daysbetweenfull
fi
- if [ -z "`find $storagedir/$computer/$sfilesystem/full/ -name \*tgz -mtime -$fullbackup_min_for_this_machine`" ]; then
+ if [ -z "`find $storagedir/$computer/$sfilesystem/full/ -name \*tgz\* -mtime -$fullbackup_min_for_this_machine`" ]; then
backuplevel=full
fi
cd $storagedir/$computer/$sfilesystem/$backuplevel || diemsg "$storagedir/$computer/$sfilesystem/$backuplevel does not exist"
# Perform the actual backup
- backup
+ if [ "$username" = "root" ]; then
+ backup
+ else
+ nonprivbackup
+ fi
# Check if this box has a custom number of full backups
if [ -f $confdir/maksfulle.$computer.$sfilesystem ]; then
fi
# Delete old full backups
- for full in `ls -1t $storagedir/$computer/$sfilesystem/full/*tgz | tail -n +$mf`; do
+ for full in `ls -1t $storagedir/$computer/$sfilesystem/full/*tgz* | tail -n +$mf`; do
prefix=`echo $full | sed "s/\.[^.]*$//"`
infomsg "$computer:$filesystem Deleting full backup $prefix"
rm $prefix*
done
# Delete incremental backups older than the oldest full backup
- oldf=`ls -t1 $storagedir/$computer/$sfilesystem/full/*tgz | tail -1`
+ oldf=`ls -t1 $storagedir/$computer/$sfilesystem/full/*tgz* | tail -1`
find \
$storagedir/$computer/$sfilesystem/daglig \
-type f \
done
# Try to run postexec if it exist
-if ! ssh root@$computer "[ ! -f /root/.backup/postexec ] || /bin/bash -x /root/.backup/postexec" >&2; then
- diemsg "Could not run $computer:/root/.backup/postexec"
+if ! ssh $username@$computer "[ ! -f $remotehome/.backup/postexec ] || /bin/bash -x $remotehome/.backup/postexec" >&2; then
+ diemsg "Could not run $computer:$remotehome/.backup/postexec"
fi
# Use warn so that we will get an email even on success.
projects / backup.sh / blobdiff