X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=backup.sh;h=0a4cb4ac2a61e7869b115fe1777974f3bd40f201;hb=c027e80dd5f2ac433fefeb76dabc4a3f7aed988b;hp=d524d5bfc4c5b5070075e1bef640585b6b6cc3ca;hpb=4af4594ad8ee33fb03b584a777f7f58a6f8b720e;p=backup.sh

diff --git a/backup.sh b/backup.sh
index d524d5b..0a4cb4a 100755
--- a/backup.sh
+++ b/backup.sh
@@ -1,4 +1,21 @@
-#!/bin/bash
+#!/bin/sh
+
+# Locking
+LOCKFILE=/home/backup/backuprun.lockfile
+
+# Die gracefully (ie. remove lockfile)
+die() {
+	rm $LOCKFILE
+	exit 255
+}
+
+trap die SIGINT SIGTERM
+
+if [ -e $LOCKFILE ]; then
+	echo `date`": $LOCKFILE exists, exiting."
+	exit 1
+fi;
+touch $LOCKFILE
 
 #dirs
 confdir=/home/backup/conf/           #configuration files
@@ -20,21 +37,26 @@ PATH=/local/bin:$PATH:/store/bin
 export PATH
 
 #start the logfile
-date
-echo
+echo `date`": Backup run starting"
 echo "Exclude pattern:"
 cat $exclude
-echo
-echo
+echo "End exclude pattern"
 
 umask 027
 
 # The computers we want to back up
-unixcomputers=`cat $confdir/computers.unix`
+unixcomputers=`cat $confdir/computers.unix \
+  | grep -v "^#" \
+  | grep -v "^$" `
+
+
+if [ $1 ] ; then 
+  unixcomputers=$1
+fi;
 ###
 
 #disse bør kunne varieres fra fs til fs?
-maksantallfulle=4          #hvor mange fulle vi tar vare på
+maksantallfulle=3          #hvor mange fulle vi tar vare på
 dagermellomfulle=30        #antall dager før det er på tide med ny full
 logw=40
 ###
@@ -55,7 +77,7 @@ backup()
  if [ "$backuplevel" = "daglig" ] || [ "$backuplevel" = "incremental" ]
  then
   lastd=`cat ../.date`
-  lastcmd="--newer=\"$lastd\""
+  lastcmd="--newer='$lastd'"
  else
   lastcmd=""
  fi
@@ -72,16 +94,29 @@ backup()
  exf=`ssh $computer "ls ~/.backup/exclude"`
 
  #We try to run tar on the remote computer
- #    C is instead of 'cd $filesystem'
- #    - is 'this directory'
- #    l is 'stay in local filesystem
- if `ssh $computer "$tar cfCl - $filesystem . $lastcmd \
-      --exclude-from=$exf \
-        | gzip" \
-   |  dd of=$DATE.tmp 2>/dev/null` 
- then
+ #    c create archive
+ #    C change to directory first
+ #    - output to stdout (we pipe to gzip, then to dd)
+ #    . where to start taring (see C)
+ #    $lastcmd only files newer than this
+ #    --exclude-from file to get exclusion pattern from
+ #    pipe to gzip, which in turn pipes over the ssh-stream
+ #    ..to dd, to output to a file. We surpress messages from dd.
+ #    And at last, redirect stderr to stdout, to get output logged.
+ TARFILE=$DATE.tmp
+ TARCMD="ssh $computer \"$tar --one-file-system -cf - -C $filesystem . $lastcmd \
+	--exclude-from=$exf | gzip\" | (dd of=$TARFILE 2> /dev/null) 2>&1"
+ echo "cmdline: $TARCMD"
+ eval $TARCMD
+
+ # Ideally, we should check wether the tar command returned 0 or not, but it
+ # seems a pipe in bash returns the value of the last command in the pipe.
+ # Instead, we check wether the resulting file has zero size, in which case we
+ # consider it an error.
+ if [ -s $TARFILE ]; then
+  echo `date`": command probably ran without errors."
   #perhaps it did work
-  mv $DATE.tmp $DATE.tgz
+  mv $TARFILE $DATE.tgz
   #make a filelist.
   #update the datefile if the filelist is ok.
   tar tvfz $DATE.tgz > $DATE.idx 2>&1 &&
@@ -97,8 +132,8 @@ backup()
 
  else
   #it did not work
-  rm $DATE.tmp 2>/dev/null
-  echo "$backuplevel backup of $computer:$filesystem failed and deleted"
+  rm $TARFILE
+  echo `date`": $TARFILE empty. $backuplevel backup of $computer:$filesystem failed and deleted"
  fi
 
 }
@@ -106,6 +141,16 @@ backup()
 #Løper gjennom listen av unixmaskiner som vi skal ta backup av
 for computer in $unixcomputers
 do
+( 
+ echo `date`": Backing up $computer"
+
+ # Try to SSH to the computer without entering a password.
+ if `ssh -n -o NumberOfPasswordPrompts=0 $computer /bin/true`; then
+  echo "Passwordless SSH to $computer works."
+ else
+  echo "Could not use passwordless SSH to $computer."
+  break;
+ fi
  
  #tømmer variabelen for sikkerhets skyld
  filesystems=""
@@ -113,21 +158,33 @@ do
  #Sjekker nest siste felt i fstab. Om det er 0 tar vi ikke backup
  filesystems=`ssh -n $computer "cat /etc/fstab" \
   | grep -v nfs \
-  | grep -v ^# \
+  | grep -v "^#" \
+  | grep -v "^$" \
   | awk '{ if ( $(NF-1) != "0" ) print $2}' `
 
+ echo "Filesystems to backup on $computer: $filesystems"
+
  #clean up our dir at this client
- ssh $computer "rm -r ~/.backup ; mkdir -m 700 ~/.backup"
+ if ! ssh $computer "rm -r ~/.backup ; mkdir -m 700 ~/.backup"; then
+  echo "Could not create backup staging area at $computer:~/.backup"
+  break;
+ fi
 
  #try to copy $exclude to $computer
- scp $exclude $computer:~/.backup/exclude ||
-    echo "could not copy exclude.txt to $computer :("
+ if ! scp $exclude $computer:~/.backup/exclude > /dev/null; then
+  echo "Could not copy exclude.txt to $computer"
+  break;
+ fi
 
  #try to copy preeexec and postexec if they exist
- [ -f $confdir/preexec.$computer ] &&
-    scp $confdir/preexec.$computer  $computer:~/.backup/preexec
- [ -f $confdir/postexec.$computer ] &&
-    scp $confdir/postexec.$computer $computer:~/.backup/postexec
+ [ -f $confdir/preexec.$computer ] && (
+    scp $confdir/preexec.$computer  $computer:~/.backup/preexec ||
+     ( echo "Could not copy preexec.$computer to $computer:~/.backup/preexec"; break )
+    )
+ [ -f $confdir/postexec.$computer ] && (
+    scp $confdir/postexec.$computer $computer:~/.backup/postexec ||
+     ( echo "Could not copy postexec.$computer to $computer:~/.backup/postexec"; break )
+    )
 
  #try to run preexec if it exist
  ssh $computer "[ -f ~/.backup/preexec ] && /bin/bash -x ~/.backup/preexec"
@@ -140,7 +197,6 @@ do
   #lager det som trengs av kataloger
   mkdir -m 755 -p $storagedir/$computer/$sfilesystem/{full,daglig} 2>/dev/null
 
-  #
   echo $filesystem > ${storagedir}/${computer}/.${sfilesystem}.name 
   chmod 644 ${storagedir}/${computer}/.${sfilesystem}.name
 
@@ -155,23 +211,28 @@ do
   fi
 
   #sjekker om det er på tide med en full
-  if 
- [ -z "`find $storagedir/$computer/$sfilesystem/full/ -name \*tgz -mtime -$dagermellomfulle`" ]
-  then
+  if [ -z "`find $storagedir/$computer/$sfilesystem/full/ -name \*tgz -mtime -$dagermellomfulle`" ]; then
    backuplevel=full
   fi
  
-  #gå ned i rett katalog
-  cd $storagedir/$computer/$sfilesystem/$backuplevel
+  #gå ned i rett katalog, eller dø 
+  # TODO bør sende mail om dette skjer!
+  cd $storagedir/$computer/$sfilesystem/$backuplevel || die
 
   #perform the actual backup
   backup
 
+  # Sjekk om det skal være et annet antall fulle backuper av en boks
+  if [ -f $confdir/maksfulle.$computer ] ; then
+    mf=$((`cat $confdir/maksfulle.$computer`+1))
+  else
+    mf=$(($maksantallfulle+1))
+  fi
+
   #delete complete backups
-  mf=$(($maksantallfulle+1))
   for full in `ls -1t $storagedir/$computer/$sfilesystem/full/*tgz | tail +$mf`
   do
-   prefix=`echo $full|cut -d . -f 1`
+   prefix=`echo $full | sed "s/\.[^.]*$//"`
    echo "$computer:$filesystem sletter full $prefix (for mange)"
    rm $prefix*
   done
@@ -183,22 +244,21 @@ do
      -type f \
      \! -newer $oldf \
      -exec rm {} \;
-     #denne funker bare med gnu find
-     #-printf "$computer:$filesystem sletter daglig %f (for gammel)\n" \
-
+#     #denne funker bare med gnu find
+#     #-printf "$computer:$filesystem sletter daglig %f (for gammel)\n"
  done
 
  #try to run postexec if it exist
  ssh $computer "[ -f ~/.backup/postexec ] && /bin/bash -x ~/.backup/postexec"
 
-done
+)  
+done &
 
-#create report
-/home/backup/report.sh $storagedir > /tmp/report.txt
-#[ ! -z $remotestat ] && scp /tmp/report.txt $remotestat
-###
+wait
 
 # print diskusage to logfile
-df -k
+echo "Current disk usage:"
+df -k $storagedir
+
+echo `date`": Backup run ended"
 
-date