X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=backup.sh;h=b808d5611e49636cec8adf41705ab2f7b6aaac01;hb=f5e26aba1db0b44ffd29cb239532fa42c002cbce;hp=4ae63a364069e0968c5853ab61e47f4f1b045d31;hpb=1819c77dd93ebff8ae70189a44a4d6cc1581e97f;p=backup.sh

diff --git a/backup.sh b/backup.sh
index 4ae63a3..b808d56 100755
--- a/backup.sh
+++ b/backup.sh
@@ -18,27 +18,15 @@
 # The script is halfway Norwegian and halfway English. Newer modifications are
 # in English, we should probably stick to that.
 
-SCRIPTPATH="$( cd "$(dirname "$0")" ; pwd -P )"  # Absolute directory the script lives in
-confdir=$SCRIPTPATH/conf/                        # Directory configuration files
-[ -r $confdir/env ] && . $confdir/env
-
-# Default configuration; used unless $confdir/env has set something different.
-storagedir=${storagedir:-/backup}                # Where we keep backups
-exclude=${exclude:-$confdir/exclude}             # List of exclude patterns
-maxnumfull=${maxnumfull:-3}                      # Number of full backups
-daysbetweenfull=${daysbetweenfull:-30}           # Days between full backups
-
-# Days between full backups for machines with fixed full-backup date
-# (in case the fixed day gets missed).
-daysbetweenfullforfixed=${daysbetweenfullforfixed:-32}
-
-# End of configuration.
-
 computer=$1                                      # The computer to backup.
+SCRIPTPATH="$( cd "$(dirname "$0")" ; pwd -P )"  # Absolute directory the script lives in
+confdir=$SCRIPTPATH/conf                         # Directory for configuration files
+conffile=$confdir/backup.config
 LOCKFILE=$SCRIPTPATH/backuprun.lockfile.$computer
 DAY_OF_MONTH=`date "+%d" | sed s/^0//`           # from 1 to 31
 DATE=`date "+%Y%m%d%H%M"`                        # format: touch
 DATEs=`date "+%Y-%m-%d %H:%M"`                   # format: tar
+TOP_PID=$$
 
 if [ -z "$computer" ]; then
 	echo "Usage: $0 COMPUTER"
@@ -64,6 +52,22 @@ warnmsg() {
 infomsg() {
 	echo `date`": $computer: $@" >&2
 }
+findconf() {  # getconf is already taken
+	key=$1
+	computer=$2
+	filesystem=$( echo $3 | tr / . )
+
+	if [ "$computer" ] && [ "$filesystem" ] && git config -f $conffile $computer$filesystem.$key > /dev/null; then
+		git config -f $conffile $computer$filesystem.$key
+	elif [ "$computer" ] && git config -f $conffile $computer.$key > /dev/null; then
+		git config -f $conffile $computer.$key
+	elif git config -f $conffile defaults.$key > /dev/null; then
+		git config -f $conffile defaults.$key
+	else
+		warnmsg "No configuration found for $key in $conffile, aborting."
+		kill -TERM $TOP_PID
+	fi
+}
 
 # Trap C-c and kill
 trap die SIGINT SIGTERM
@@ -111,11 +115,7 @@ backup()
 	# 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
+	storageprogram=$( findconf storageprogram $computer $sfilesystem )
 
 	# We try to run tar on the remote computer
 	#    c create archive
@@ -128,7 +128,7 @@ 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 -n $username@$computer \"nice -n 19 ionice -c3 tar --one-file-system --use-compress-program $compressor -cf - -C $filesystem . $lastcmd \
+	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
@@ -207,6 +207,11 @@ nonprivbackup()
 	fi
 }
 
+# Get basic configuration.
+storagedir=$( findconf storagedir $computer )
+username=$( findconf username $computer )
+exclude=$( findconf excludefile $computer )
+
 # Check that the target filesystem is mounted (actually check that it's not
 # the root filesystem)
 if [ ! -d "$storagedir/$computer" ]; then
@@ -218,13 +223,6 @@ 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.
@@ -246,6 +244,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 \
@@ -297,18 +303,14 @@ for filesystem in $filesystems; do
 	fi
 
 	# Check if we want a full backup
-	if [ -f $confdir/fastfullbackupdag.$computer.$sfilesystem ]; then
-		fullbackup_min_for_this_machine=$daysbetweenfullforfixed
-		if [ "$DAY_OF_MONTH" = "`cat $confdir/fastfullbackupdag.$computer.$sfilesystem`" ]; then
-			backuplevel=full
-		fi
-	elif [ -f $confdir/fastfullbackupdag.$computer ]; then
-		fullbackup_min_for_this_machine=$daysbetweenfullforfixed
-		if [ "$DAY_OF_MONTH" = "`cat $confdir/fastfullbackupdag.$computer`" ]; then
+	fixedfullbackupday=$( findconf fixedfullbackupday $computer $filesystem )
+	if [ "$fixedfullbackupday" ]; then
+		fullbackup_min_for_this_machine=$( findconf daysbetweenfullforfixed $computer $filesystem )
+		if [ "$DAY_OF_MONTH" = "$fixedfullbackupday" ]; then
 			backuplevel=full
 		fi
 	else
-		fullbackup_min_for_this_machine=$daysbetweenfull 
+		fullbackup_min_for_this_machine=$( findconf daysbetweenfull $computer $filesystem )
 	fi
 
 	if [ -z "`find $storagedir/$computer/$sfilesystem/full/ -name \*tgz\* -mtime -$fullbackup_min_for_this_machine`" ]; then
@@ -319,22 +321,15 @@ for filesystem in $filesystems; do
 	cd $storagedir/$computer/$sfilesystem/$backuplevel || diemsg "$storagedir/$computer/$sfilesystem/$backuplevel does not exist"
 
 	# Perform the actual backup
-	if [ "$username" = "root" ]; then
-		backup
-	else
+	if [ "$( findconf nonpriv $computer )" ]; then
 		nonprivbackup
-	fi
-
-	# Check if this box has a custom number of full backups
-	if [ -f $confdir/maksfulle.$computer.$sfilesystem ]; then
-		mf=$((`cat $confdir/maksfulle.$computer.$sfilesystem`+1))
-	elif [ -f $confdir/maksfulle.$computer ] ; then
-		mf=$((`cat $confdir/maksfulle.$computer`+1))
 	else
-		mf=$(($maxnumfull+1))
+		backup
 	fi
 
 	# Delete old full backups
+	mf=$( findconf maxnumfull $computer $filesystem )
+	mf=$(( mf + 1 ))
 	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"