X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=backup.sh;h=7d4ee304118f5c95a509b618fa4d03bda8a7c55c;hb=cf817078ff01cf9a58ffa7447bfb0c7a903a9aff;hp=bfc243af0a9b2c2a4560d061fa9f586b5b70910c;hpb=051e48d51c4f4fc416dd3f4a3055959ef8dadb5a;p=backup.sh

diff --git a/backup.sh b/backup.sh
index bfc243a..7d4ee30 100755
--- a/backup.sh
+++ b/backup.sh
@@ -1,8 +1,7 @@
-#!/bin/bash
+#!/bin/sh
 
 #dirs
 confdir=/home/backup/conf/           #configuration files
-webdir=/home/backup/public_html      #web-pages
 storagedir=/backup                   #mountpoint of huge disc
 ###
 
@@ -31,13 +30,18 @@ echo
 umask 027
 
 # The computers we want to back up
-unixcomputers=`cat $confdir/computers.unix`
-#ntcomputers=`cat $confdir/computers.nt`
+unixcomputers=`cat $confdir/computers.unix \
+  | grep -v "^#" \
+  | grep -v "^$" `
+
+
+if [ $1 ] ; then 
+  unixcomputers=$1
+fi;
 ###
 
 #disse bør kunne varieres fra fs til fs?
-#disse bør flyttes ut i egen fil som kan editeres fra web kanskje?
-maksantallfulle=2          #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
 ###
@@ -57,22 +61,37 @@ backup()
 
  if [ "$backuplevel" = "daglig" ] || [ "$backuplevel" = "incremental" ]
  then
-  forrige=`cat ../.date`
-  forrigecmd=--newer=\"$forrige\"
+  lastd=`cat ../.date`
+  lastcmd="--newer=\"$lastd\""
  else
-  forrigecmd=""
+  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
 
- #Prøver å ta backup med tar
- if `ssh $computer "cd $filesystem ;\
-     tar cfl - . $forrigecmd \
-      --exclude-from=/tmp/.backup/exclude \
+ #expand the exclude-path for use with tar
+ 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
+ echo "cmdline: $tar cfCl - $filesystem . $lastcmd --exclude-from=$exf | gzip"
+ if `ssh -c blowfish $computer "$tar cfCl - $filesystem . $lastcmd \
+      --exclude-from=$exf \
         | gzip" \
    |  dd of=$DATE.tmp 2>/dev/null` 
  then
   #perhaps it did work
   mv $DATE.tmp $DATE.tgz
-  #make a filelist and update the datefile
+  #make a filelist.
+  #update the datefile if the filelist is ok.
   tar tvfz $DATE.tgz > $DATE.idx 2>&1 &&
     echo $DATEs > ../.date            &&
     touch -t $DATE ../.date
@@ -81,13 +100,14 @@ backup()
   grep -v ^d $DATE.idx | sort -n -r +2 > $DATE.sdx
 
   #fix perm
-  chmod 600 *tgz
-  chmod 644 *sdx *idx
+  chmod 600 *tgz                      #only for us
+  chmod 644 *sdx *idx 2>/dev/null     #everyone can read
 
  else
   #it did not work
-  rm $DATE.tmp
-  echo "$backuplevel backup of $computer:$filesystem failed"
+  rm $DATE.tmp 2>/dev/null
+  echo "$backuplevel backup of $computer:$filesystem failed and deleted"
+  # TODO send mail!
  fi
 
 }
@@ -95,32 +115,32 @@ backup()
 #Løper gjennom listen av unixmaskiner som vi skal ta backup av
 for computer in $unixcomputers
 do
- 
+( 
  #tømmer variabelen for sikkerhets skyld
  filesystems=""
 
  #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}' `
 
  #clean up our dir at this client
- ssh $computer "rm -rf /tmp/.backup ; mkdir -m 700 /tmp/.backup"
+ ssh $computer "rm -r ~/.backup ; mkdir -m 700 ~/.backup"
 
  #try to copy $exclude to $computer
- scp $exclude $computer:/tmp/.backup/exclude ||
-    echo "Vi klarte ikke kopiere over exclude.txt til $computer :("
+ scp $exclude $computer:~/.backup/exclude ||
+    echo "could not copy exclude.txt to $computer :("
 
  #try to copy preeexec and postexec if they exist
  [ -f $confdir/preexec.$computer ] &&
-    scp $confdir/preexec.$computer  $computer:/tmp/.backup/preexec
+    scp $confdir/preexec.$computer  $computer:~/.backup/preexec
  [ -f $confdir/postexec.$computer ] &&
-    scp $confdir/postexec.$computer $computer:/tmp/.backup/postexec
+    scp $confdir/postexec.$computer $computer:~/.backup/postexec
 
  #try to run preexec if it exist
- ssh $computer "[ -f /tmp/.backup/preexec ] && 
-                   /bin/bash -x /tmp/.backup/preexec"
+ ssh $computer "[ -f ~/.backup/preexec ] && /bin/bash -x ~/.backup/preexec"
 
  for filesystem in $filesystems
  do
@@ -131,8 +151,8 @@ do
   mkdir -m 755 -p $storagedir/$computer/$sfilesystem/{full,daglig} 2>/dev/null
 
   #
-  echo $filesystem > $storagedir/$computer/$sfilesystem.name
-  chmod 644 $storagedir/$computer/$sfilesystem.name
+  echo $filesystem > ${storagedir}/${computer}/.${sfilesystem}.name 
+  chmod 644 ${storagedir}/${computer}/.${sfilesystem}.name
 
   #set default backuplevel
   backuplevel=daglig
@@ -146,22 +166,29 @@ do
 
   #sjekker om det er på tide med en full
   if 
- [ -z `find $storagedir/$computer/$sfilesystem/full/ -name \*tgz -mtime -$dagermellomfulle` ]
+ [ -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 || exit 1
 
   #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
@@ -170,22 +197,27 @@ do
   oldf=`ls -t1 $storagedir/$computer/$sfilesystem/full/*tgz | tail -1`
   find \
      $storagedir/$computer/$sfilesystem/daglig \
+     -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 /tmp/.backup/postexec ] &&
-                   /bin/bash -x /tmp/.backup/postexec"
+ ssh $computer "[ -f ~/.backup/postexec ] && /bin/bash -x ~/.backup/postexec"
 
-done
+)  
+done &
+
+wait
 
 #create report
 /home/backup/report.sh $storagedir > /tmp/report.txt
-[ ! -z $remotestat ] && scp /tmp/report.txt $remotestat
+#[ ! -z $remotestat ] && scp /tmp/report.txt $remotestat
 ###
 
+# print diskusage to logfile
+df -k
+
 date