s3: Make location of hmac script a constant.

[clinton/scripts.git] / hcoop-backup

diff --git a/hcoop-backup b/hcoop-backup
index 70a9e64..9ecad5d 100755 (executable)
--- a/hcoop-backup
+++ b/hcoop-backup
@@ -8,24 +8,32 @@
 # 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
-BWLIMIT=250
 # units for BWLIMIT are KB/s
+BWLIMIT=325
 
 IFS=$'\n'
 
+SCRIPTDIR=$(dirname $0)
 KEYFILE=/etc/backup-encryption-key
-BACKUPDIR=/afs/megacz.com/private/hcoop-backup
-BACKUPTMP=/var/backups/hcoop-backup
+BACKUPDIR=/hcoop.net-backups
+BACKUPTMP=/var/backups/hcoop-backup-testing
 SUBDIR=`date +%Y.%m.%d`
 
-#SYNC_CMD="rsync --bwlimit=$BWLIMIT --remove-source-files"
+S3_ACCESS_KEY=$(cat ~mwolson_admin/.amazon/access.key)
+S3_SECRET_KEY_FILE=~mwolson_admin/.amazon/secret.key
+
+function s3_cmd () {
+    local cmd=$1
+    shift
+    $SCRIPTDIR/s3-$cmd -k $S3_ACCESS_KEY -s $S3_SECRET_KEY_FILE $@
+}
 
 function copy_over () {
     # Move file to its offsite destination
@@ -39,15 +47,22 @@ function copy_over () {
     if test -n "$2"; then
         DEST=$DEST/$2
     fi
-    cat $FILE | catsync -b $BWLIMIT $DEST/$FILE
+    s3_cmd put -b ${BWLIMIT}K -T $FILE $DEST/$FILE
     rm -f $FILE
 }
 
-cd $BACKUPDIR
-find . -mindepth 1 -maxdepth 1 -type d -ctime +3 -delete || true
+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
 
-rm -rf $SUBDIR
-mkdir -p $SUBDIR
 mkdir -p $BACKUPTMP
 cd $BACKUPTMP
 
@@ -92,8 +107,9 @@ 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/vim/addons/doc/tags$' | \
- cat > backupfiles
+ grep -v '^/usr/share/snmp/mibs/\.index$' | \
+ grep -v '^/usr/share/vim/addons/doc/tags$' \
+ > backupfiles
 
 cat conffiles >> backupfiles
 
@@ -104,6 +120,7 @@ cat backupfiles | \
  grep -v ^/var/log | \
  grep -v ^/usr/lib/python2.4/ | \
  grep -v ^/var/lib/python-support | \
+ grep -v ^/usr/share/jed/lib | \
  grep -v ^/usr/share/man | \
  grep -v ^/usr/share/perl5/IkiWiki/Plugin | \
  grep -v ^/media | \
@@ -163,8 +180,8 @@ vos listvol deleuze | \
   grep -v "\.readonly .*$" | \
   sed 's_^ .*__' | \
   sed 's_ .*$__' | \
-  grep '[A-Za-z]' | \
-  cat > volumes
+  grep '[A-Za-z]' \
+  > volumes
 
 cat volumes | \
   grep -v not-backed-up | \
@@ -173,7 +190,7 @@ cat volumes | \
     "F={}.dump$COMPRESS_EXT.aescrypt ;
      vos dump -id {} -localauth -clone |
        $COMPRESS_PROG | ccrypt -k $KEYFILE -e > \$F ;
-     cat \$F | catsync -b $BWLIMIT $BACKUPDIR/$SUBDIR/\$F ;
+     < \$F catsync -b $BWLIMIT $BACKUPDIR/$SUBDIR/\$F ;
      rm -f \$F"
 
 echo backing up databases