#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-testing
+
+MOVE_OVER=$(dirname $0)/s3-move
IFS=$'\n'
-SCRIPTDIR=$(dirname $0)
-KEYFILE=/etc/backup-encryption-key
-BACKUPDIR=/hcoop.net-backups
-BACKUPTMP=/var/backups/hcoop-backup-testing
-SUBDIR=`date +%Y.%m.%d`
-
-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
- # $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 -b ${BWLIMIT}K -T $FILE $DEST/$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
tar clpf - --ignore-failed-read --no-recursion -C / -T backupfiles | \
$COMPRESS_PROG | \
ccrypt -k $KEYFILE -e > $F
-copy_over $F
+$MOVE_OVER $F
# Acquire lock before messing with spamd
COUNT=0
$COMPRESS_PROG | \
ccrypt -k $KEYFILE -e > $F.new
rm -f $LOCK
-copy_over $F.new ..
-
-test -s $BACKUPDIR/$F.new && \
- mv $BACKUPDIR/$F.new $BACKUPDIR/$F
+$MOVE_OVER $F
vos listvol deleuze | \
tail -n +2 | \
"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"
+ $MOVE_OVER \$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
+$MOVE_OVER $F
grep '[a-z/]' complain && \
mail -a 'From: The Backup Program <backups@deleuze.hcoop.net>' \