X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=backup.sh;h=6f67ee024b5fecc2b620f33b4f3a9f3d78a2def4;hb=e4df5a6ad04b19f05b0a0c6c50a5993ca0b85573;hp=3244d75afd9e6d39bf1093948ff28b3e1a7198e7;hpb=a2dd914e32d8dac8211988319ccdabcbe8d62241;p=backup.sh

diff --git a/backup.sh b/backup.sh
index 3244d75..6f67ee0 100755
--- a/backup.sh
+++ b/backup.sh
@@ -2,7 +2,6 @@
 
 #dirs
 confdir=/home/backup/conf/           #configuration files
-webdir=/home/backup/public_html      #web-pages
 storagedir=/backup                   #mountpoint of huge disc
 ###
 
@@ -35,7 +34,6 @@ unixcomputers=`cat $confdir/computers.unix`
 ###
 
 #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
@@ -56,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
@@ -80,8 +92,8 @@ backup()
   grep -v ^d $DATE.idx | sort -n -r +2 > $DATE.sdx
 
   #fix perm
-  chmod 600 *tgz
-  chmod 644 *sdx *idx 2>/dev/null
+  chmod 600 *tgz                      #only for us
+  chmod 644 *sdx *idx 2>/dev/null     #everyone can read
 
  else
   #it did not work
@@ -105,21 +117,20 @@ 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
@@ -178,14 +189,16 @@ do
  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
 
 #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