bare tatt med en du -k etter backup

[backup.sh] / backup.sh

diff --git a/backup.sh b/backup.sh
index 05c7a56a5eeb1a71e6f16a207d5e8ab3f562baee..6f67ee024b5fecc2b620f33b4f3a9f3d78a2def4 100755 (executable)
--- a/backup.sh
+++ b/backup.sh
@@ -2,19 +2,25 @@
 
 #dirs
 confdir=/home/backup/conf/           #configuration files
-webdir=/home/backup/public_html      #web-pages
 storagedir=/backup                   #mountpoint of huge disc
 ###
 
+#exclude-pattern
 exclude=$confdir/exclude
 [ ! -f $exclude ] && printf "tmp\ncore\n" > $exclude
+###
+
+#syntax of remotestat:
+#hostname:/directory/
+remotestatf=$confdir/remotestat
+[ -f $remotestatf ] && remotestat=`cat $remotestatf`
+###
 
-PATH=/local/bin:$PATH
+PATH=/local/bin:$PATH:/store/bin
 export PATH
 
+#start the logfile
 date
-
-#Skriver litt til loggefilen
 echo
 echo "Exclude pattern:"
 cat $exclude
@@ -25,11 +31,9 @@ umask 027
 
 # The computers we want to back up
 unixcomputers=`cat $confdir/computers.unix`
-ntcomputers=`cat $confdir/computers.nt`
 ###
 
 #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å
 dagermellomfulle=30        #antall dager før det er på tide med ny full
 logw=40
@@ -50,22 +54,36 @@ backup()
 
  if [ "$backuplevel" = "daglig" ] || [ "$backuplevel" = "incremental" ]
  then
-  forrige=`cat ../.date`
-  forrigecmd=--newer=\"$forrige\"
+  lastd=`cat ../.date`
+  lastcmd="--newer=\"$lastd\""
  else
-  forrigecmd=""
+  lastcmd=""
  fi
 
- #Prøver å ta backup med tar
- if `ssh $computer "cd $filesystem ;\
-     tar cfl - . $forrigecmd \
-      --exclude-from=/tmp/.backup/exclude \
+ #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 $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
   #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
@@ -74,13 +92,13 @@ 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"
  fi
 
 }
@@ -99,37 +117,36 @@ do
   | 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
   #lager en variant uten tegnet "/" eller $ (gjelder NT)
   sfilesystem=`echo $filesystem | tr '\/\$' '__'`
 
+  #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
+  echo $filesystem > ${storagedir}/${computer}/.${sfilesystem}.name 
+  chmod 644 ${storagedir}/${computer}/.${sfilesystem}.name
 
   #set default backuplevel
   backuplevel=daglig
 
-  #lager det som trengs av kataloger
-  mkdir -m 755 -p $storagedir/$computer/$sfilesystem/{full,daglig} 2>/dev/null
-
   if [ ! -f $storagedir/$computer/$sfilesystem/.date ]
   then
    #take the first full backup of this filesystem on this computer
@@ -163,23 +180,25 @@ do
   oldf=`ls -t1 $storagedir/$computer/$sfilesystem/full/*tgz | tail -1`
   find \
      $storagedir/$computer/$sfilesystem/daglig \
+     -type f \
      \! -newer $oldf \
-     -printf "$computer:$filesystem sletter daglig %f (for gammel)\n" \
      -exec rm {} \;
+     #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
 
-#Finne de backupene som har tryna og 
-#lage en webside med de
-/home/backup/finn_ufullstendige.sh $storagedir $webdir/ufullstendige.html
+#create report
+/home/backup/report.sh $storagedir > /tmp/report.txt
+#[ ! -z $remotestat ] && scp /tmp/report.txt $remotestat
+###
 
-#Lage søkbar indeks over listefilene
-/home/backup/indekser.sh $storagedir
+# print diskusage to logfile
+df -k
 
 date