hcoop-backup: Put temp output in hcoop-backup, not hcoop-backup-testing.

[clinton/scripts.git] / hcoop-backup

diff --git a/hcoop-backup b/hcoop-backup
index 39fb266..98920db 100755 (executable)
--- a/hcoop-backup
+++ b/hcoop-backup
@@ -16,7 +16,8 @@ PATH=$PATH:/bin:/usr/bin:/sbin:/usr/sbin
 COMPRESS_EXT=.gz
 COMPRESS_PROG=gzip
 KEYFILE=/etc/backup-encryption-key
-BACKUPTMP=/var/backups/hcoop-backup-testing
+BACKUPTMP=/var/backups/hcoop-backup
+CURDATE=$(date +%Y.%m.%d)
 
 MOVE_OVER=$(dirname $0)/s3-move
 
@@ -105,7 +106,7 @@ F=hcoop.backup.tar$COMPRESS_EXT.aescrypt
 tar clpf - --ignore-failed-read --no-recursion -C / -T backupfiles | \
   $COMPRESS_PROG | \
   ccrypt -k $KEYFILE -e | \
-  $MOVE_OVER $F
+  $MOVE_OVER $CURDATE $F
 
 # Acquire lock before messing with spamd
 COUNT=0
@@ -128,7 +129,7 @@ tar clpf - --ignore-failed-read -C / /var/local/lib/spamd | \
   $COMPRESS_PROG | \
   ccrypt -k $KEYFILE -e > $F
 rm -f $LOCK
-< $F $MOVE_OVER $F
+< $F $MOVE_OVER $CURDATE $F
 rm -f $F
 
 vos listvol deleuze | \
@@ -145,18 +146,18 @@ 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 |
-       $MOVE_OVER \$F"
+       $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 | \
-  $MOVE_OVER $F
+  $MOVE_OVER $CURDATE $F
 
 grep '[a-z/]' complain && \
   mail -a 'From: The Backup Program <backups@deleuze.hcoop.net>' \