hcoop-backup: Keep track of date.

[hcoop/scripts.git] / hcoop-backup

diff --git a/hcoop-backup b/hcoop-backup
index 70a9e64..934c257 100755 (executable)
--- a/hcoop-backup
+++ b/hcoop-backup
@@ -8,46 +8,23 @@
 # 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
+KEYFILE=/etc/backup-encryption-key
+BACKUPTMP=/var/backups/hcoop-backup-testing
+CURDATE=$(date +%Y.%m.%d)
 
-IFS=$'\n'
+MOVE_OVER=$(dirname $0)/s3-move
 
-KEYFILE=/etc/backup-encryption-key
-BACKUPDIR=/afs/megacz.com/private/hcoop-backup
-BACKUPTMP=/var/backups/hcoop-backup
-SUBDIR=`date +%Y.%m.%d`
-
-#SYNC_CMD="rsync --bwlimit=$BWLIMIT --remove-source-files"
-
-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
-    cat $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
 
@@ -92,8 +69,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 +82,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 | \
@@ -126,8 +105,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
@@ -148,12 +127,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 | \
@@ -163,8 +140,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 | \
@@ -172,16 +149,15 @@ cat volumes | \
   bash -c \
     "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 ;
-     rm -f \$F"
+       $COMPRESS_PROG | ccrypt -k $KEYFILE -e |
+       $MOVE_OVER $CURDATE \$F"
 
 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>' \