X-Git-Url: http://git.hcoop.net/clinton/scripts.git/blobdiff_plain/c13b2355fcb8f9ef2d2be49fd72498a45ed93935..86a0f2e2d64c035e30dc4dc9634de8b1fb1e5c39:/hcoop-backup

diff --git a/hcoop-backup b/hcoop-backup
index 6308105..5340f8e 100755
--- a/hcoop-backup
+++ b/hcoop-backup
@@ -15,66 +15,24 @@ PATH=$PATH:/bin:/usr/bin:/sbin:/usr/sbin
 #COMPRESS_PROG=bzip2
 COMPRESS_EXT=.gz
 COMPRESS_PROG=gzip
-# units for BWLIMIT are KB/s
-BWLIMIT=325
+KEYFILE=/etc/backup-encryption-key
+BACKUPTMP=/var/backups/hcoop-backup
+CURDATE=$(date +%Y.%m.%d)
+
+MOVE_OVER=$(dirname $0)/s3-move
 
 IFS=$'\n'
 
-SCRIPTDIR=$(dirname $0)
-KEYFILE=/etc/backup-encryption-key
-BUCKET=hcoop.net-backups
-BACKUPDIR=full
-BACKUPTMP=/var/backups/hcoop-backup-testing
-SUBDIR=$(date +%Y.%m.%d)
-
-export S3_ACCESS_KEY_ID=$(cat ~mwolson_admin/.amazon/access.key)
-export S3_SECRET_ACCESS_KEY=~mwolson_admin/.amazon/secret.key
-
-function s3_cmd () {
-    # $1: command (get|put|ls|rm)
-    # $2: bucket
-    # $3: destination
-    # $4: source file
-    $SCRIPTDIR/s3 $1 $2 $3 $4 ${BWLIMIT}K
-}
-
-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
-    s3_cmd put $BUCKET $DEST/$FILE $FILE
-    rm -f $FILE
-}
-
-function prune_old_backups () {
-    local oldpwd=$PWD
-    cd $BACKUPDIR
-    find . -mindepth 1 -maxdepth 1 -type d -ctime +7 \
-        -execdir rm -fr '{}' \; || true
-    rm -rf $SUBDIR
-    mkdir -p $SUBDIR
-    cd $oldpwd
-}
-
-prune_old_backups
+#prune_old_backups
 
 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
@@ -130,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/ | \
@@ -146,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
@@ -168,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 | \
@@ -189,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."