X-Git-Url: http://git.hcoop.net/clinton/scripts.git/blobdiff_plain/451f65fdd12b7f9a9c5ba7afbcfa111b5d2dbe0f..a2983bf8f9241b733bb827cf58ca54768026e986:/hcoop-backup

diff --git a/hcoop-backup b/hcoop-backup
index 2f5c794..5340f8e 100755
--- a/hcoop-backup
+++ b/hcoop-backup
@@ -8,55 +8,31 @@
 # run this script as root, on deleuze
 #
 
-exec >& /var/log/backup-to-megacz.com-log
+exec >& /var/log/backup-to-s3-log
 
 PATH=$PATH:/bin:/usr/bin:/sbin:/usr/sbin
 #COMPRESS_EXT=.bz2
 #COMPRESS_PROG=bzip2
 COMPRESS_EXT=.gz
 COMPRESS_PROG=gzip
-# units for BWLIMIT are KB/s
-BWLIMIT=325
-
-IFS=$'\n'
-
 KEYFILE=/etc/backup-encryption-key
-BACKUPDIR=/afs/megacz.com/private/hcoop-backup
 BACKUPTMP=/var/backups/hcoop-backup
-SUBDIR=`date +%Y.%m.%d`
+CURDATE=$(date +%Y.%m.%d)
 
-#SYNC_CMD="rsync --bwlimit=$BWLIMIT --remove-source-files"
+MOVE_OVER=$(dirname $0)/s3-move
 
-function copy_over () {
-    # Move file to its offsite destination
-    # $1: file, $2: relative directory (optional)
-    if test -z "$1" || test -n "$3"; then
-        echo "Bad programming"
-        exit 1
-    fi
-    local FILE=$1
-    local DEST=$BACKUPDIR/$SUBDIR
-    if test -n "$2"; then
-        DEST=$DEST/$2
-    fi
-    < $FILE catsync -b $BWLIMIT $DEST/$FILE
-    rm -f $FILE
-}
+IFS=$'\n'
 
-cd $BACKUPDIR
-find . -mindepth 1 -maxdepth 1 -type d -ctime +3 -delete || true
+#prune_old_backups
 
-rm -rf $SUBDIR
-mkdir -p $SUBDIR
 mkdir -p $BACKUPTMP
 cd $BACKUPTMP
 
 groups
-echo 'I am in:'
-pwd
+echo "I am in: $(pwd)"
 echo
 
-echo building package lists...
+echo "Building package lists..."
 dpkg-query -W -f='${Package}\n' > packages
 (cd /; find / /usr/ /usr/local/ /var/ -xdev)   | sort | uniq > allfiles
 dpkg-query -W -f='${Package}\n'      | xargs dpkg -L | sort | uniq > debfiles
@@ -92,6 +68,7 @@ diff allfiles debfiles | grep '^<' | cut -b 3- | \
  grep -v '^/usr/share/info/dir\.old$' | \
  grep -v '^/usr/share/emacs21/site-lisp/' | \
  grep -v '^/usr/share/emacs22/site-lisp/' | \
+ grep -v '^/usr/share/snmp/mibs/\.index$' | \
  grep -v '^/usr/share/vim/addons/doc/tags$' \
  > backupfiles
 
@@ -111,7 +88,7 @@ cat backupfiles | \
  grep -v ^/vmlinuz | \
  grep -v ^/vmlinuz.old | \
  grep -v '^/sbin/[a-z\-]*\.modutils$' | \
- grep -v ^/opt/dell/srvadmin/ | \
+ grep -v ^/opt | \
  grep -v ^/boot/ | \
  grep -v ^/dev/ | \
  grep -v ^/etc/ | \
@@ -127,8 +104,8 @@ cat backupfiles | \
 F=hcoop.backup.tar$COMPRESS_EXT.aescrypt
 tar clpf - --ignore-failed-read --no-recursion -C / -T backupfiles | \
   $COMPRESS_PROG | \
-  ccrypt -k $KEYFILE -e > $F
-copy_over $F
+  ccrypt -k $KEYFILE -e | \
+  $MOVE_OVER $CURDATE $F
 
 # Acquire lock before messing with spamd
 COUNT=0
@@ -149,12 +126,10 @@ touch $LOCK
 F=common.spamd.tar$COMPRESS_EXT.aescrypt
 tar clpf - --ignore-failed-read -C / /var/local/lib/spamd | \
   $COMPRESS_PROG | \
-  ccrypt -k $KEYFILE -e > $F.new
+  ccrypt -k $KEYFILE -e > $F
 rm -f $LOCK
-copy_over $F.new ..
-
-test -s $BACKUPDIR/$F.new && \
-    mv $BACKUPDIR/$F.new $BACKUPDIR/$F
+< $F $MOVE_OVER $CURDATE $F
+rm -f $F
 
 vos listvol deleuze | \
   tail -n +2 | \
@@ -170,25 +145,23 @@ vos listvol deleuze | \
 cat volumes | \
   grep -v not-backed-up | \
   xargs -I{} -d\\n -- \
-  bash -c \
+  bash -e -c \
     "F={}.dump$COMPRESS_EXT.aescrypt ;
      vos dump -id {} -localauth -clone |
-       $COMPRESS_PROG | ccrypt -k $KEYFILE -e > \$F ;
-     < \$F catsync -b $BWLIMIT $BACKUPDIR/$SUBDIR/\$F ;
-     rm -f \$F"
+       $COMPRESS_PROG | ccrypt -k $KEYFILE -e |
+       $MOVE_OVER $CURDATE \$F" || :
 
-echo backing up databases
+echo "Backing up databases ..."
 F=databases.tar$COMPRESS_EXT.aescrypt
 tar -C /var/backups/databases/ -cf - . | \
   $COMPRESS_PROG | \
-  ccrypt -k $KEYFILE -e > $F
-copy_over $F
+  ccrypt -k $KEYFILE -e | \
+  $MOVE_OVER $CURDATE $F
 
 grep '[a-z/]' complain && \
   mail -a 'From: The Backup Program <backups@deleuze.hcoop.net>' \
        -s "automated message: annoying files found on deleuze (please do something about them)" admins@hcoop.net \
        < complain \
-  || true
-
-echo done
+  || :
 
+echo "Done."