X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=backup.sh;h=aceb9f3a928cb951583388ab549475f34eea19e2;hb=5ed197dc74c4d0bdbf7db2a023f7147af6ce64d4;hp=780a2d76ccd282cf837d4ffe45eaf824230298de;hpb=25ddd8a8f5625e3a89682c0601ab02cb05faadf2;p=backup.sh

diff --git a/backup.sh b/backup.sh
index 780a2d7..aceb9f3 100755
--- a/backup.sh
+++ b/backup.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 # backup.sh
 # 
 # Backup up Unix-like computers
@@ -12,13 +12,13 @@
 # mind when hacking:
 #
 # KISS. And by that I mean really simple. Only regular Unix commands, please
-# (but GNU extensions are used).
+# (but GNU extensions are used and moreutils has to be installed).
 #
 # Because of the way we run this script from cron, informational logging goes
 # to stderr and warnings and errors to stdout. This way, we get mail whenever
 # stuff fails, and other output is redirected to the log file.
 # 
-# The computers are backed up in parallell (but the filesystems on each
+# The computers are backed up in parallel (but the filesystems on each
 # computer in serial). This is implemented highly simplistic, with forking
 # subshells. The script has no concept about threads, and stuff might go wrong,
 # which usually requires manual cleanups.
@@ -35,12 +35,15 @@
 
 # Configuration
 LOCKFILE=/home/backup/backuprun.lockfile
-confdir=/home/backup/conf/           # Configuration files
-storagedir=/backup                   # Where we keep backups
-maksantallfulle=3                    # Number of full backups
-dagermellomfulle=30                  # Days between full backups
-DATE=`date "+%Y%m%d%H%M"`            #format: touch
-DATEs=`date "+%Y-%m-%d %H:%M"`       #format: tar
+confdir=/home/backup/conf/              # Configuration files
+storagedir=/backup                      # Where we keep backups
+maksantallfulle=3                       # Number of full backups
+dagermellomfulle=30                     # Days between full backups
+dagermellomfulleforfast=32              # Days between full backups for machines with fixed
+                                        # full-backup date (in case the fixed day gets missed)
+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
 
 # Exclude-pattern
 exclude=$confdir/exclude
@@ -90,8 +93,7 @@ unixcomputers=`cat $confdir/computers.unix \
 # Backup only one computer, from command line?
 if [ $1 ] ; then 
   unixcomputers=$1
-fi;
-
+fi
 
 #selve backupen
 # krever at noen variabler er satt
@@ -100,7 +102,7 @@ backup()
 {
 
  echo -n `date` >&2
- printf " $computer: $computer:$filesystem $backuplevel backup" >&2
+ printf " $computer: $computer:$filesystem $backuplevel backup\n" >&2
 
  if [ "$backuplevel" = "daglig" ] || [ "$backuplevel" = "incremental" ]
  then
@@ -110,14 +112,6 @@ backup()
   lastcmd=""
  fi
 
- #if this client has a special tar
- #we need to find a better solution to this conf-issue
- if [ -f $confdir/tar.$computer ] ; then
-   tar=`cat $confdir/tar.$computer`
- else 
-   tar=tar
- fi
-
  # expand the exclude-path for use with tar
  exf=`ssh root@$computer "ls ~/.backup/exclude"`
 
@@ -132,7 +126,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 root@$computer \"$tar --one-file-system -zcf - -C $filesystem . $lastcmd \
+ TARCMD="ssh root@$computer \"nice -n 19 ionice -c3 tar --one-file-system -zcf - -C $filesystem . $lastcmd \
 	--exclude-from=$exf\" | pee \"cat > $TARFILE\" \"tar tzvf -\""
  echo `date`" $computer: Running $TARCMD" >&2
  eval $TARCMD > $DATE.idx
@@ -153,6 +147,9 @@ backup()
   chmod 600 *tgz                      #only for us
   chmod 644 *sdx *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
+
  else
   # Something wrong happened.
   rm $TARFILE
@@ -241,7 +238,8 @@ do
   sfilesystem=`echo $filesystem | tr '\/\$' '__'`
 
   # Prepare storage area
-  mkdir -m 755 -p $storagedir/$computer/$sfilesystem/{full,daglig} 2>/dev/null
+  mkdir -m 755 -p $storagedir/$computer/$sfilesystem/full 2>/dev/null
+  mkdir -m 755 -p $storagedir/$computer/$sfilesystem/daglig 2>/dev/null
   echo $filesystem > ${storagedir}/${computer}/.${sfilesystem}.name 
   chmod 644 ${storagedir}/${computer}/.${sfilesystem}.name
 
@@ -255,11 +253,26 @@ do
    echo $DATEs > $storagedir/$computer/$sfilesystem/.date
   fi
 
-  # Check if we want a full backup
-  if [ -z "`find $storagedir/$computer/$sfilesystem/full/ -name \*tgz -mtime -$dagermellomfulle`" ]; then
+  # Check if we want a full backup - Debug statement that causes noise in cron mail:
+  # printf " $computer $filesystem: $confdir/fastfullbackupdag.$computer.$sfilesystem\n"
+  if [ -f $confdir/fastfullbackupdag.$computer.$sfilesystem ]; then
+    fullbackup_min_for_this_machine=$dagermellomfulleforfast
+    if [ "$DAY_OF_MONTH" = "`cat $confdir/fastfullbackupdag.$computer.$sfilesystem`" ]; then
+      backuplevel=full
+    fi
+  elif [ -f $confdir/fastfullbackupdag.$computer ]; then
+    fullbackup_min_for_this_machine=$dagermellomfulleforfast
+    if [ "$DAY_OF_MONTH" = "`cat $confdir/fastfullbackupdag.$computer`" ]; then
+      backuplevel=full
+    fi
+  else
+    fullbackup_min_for_this_machine=$dagermellomfulle 
+  fi
+
+  if [ -z "`find $storagedir/$computer/$sfilesystem/full/ -name \*tgz -mtime -$fullbackup_min_for_this_machine`" ]; then
    backuplevel=full
   fi
- 
+
   # We want to be here
   cd $storagedir/$computer/$sfilesystem/$backuplevel || die