X-Git-Url: http://git.hcoop.net/clinton/scripts.git/blobdiff_plain/a5a60f0c2c38227fdd12a90c2cd81871baf8d41f..3b16fa867a36f38b2032b8f49c8725f6ac711418:/hcoop-backup

diff --git a/hcoop-backup b/hcoop-backup
index 39fb266..934c257 100755
--- a/hcoop-backup
+++ b/hcoop-backup
@@ -17,6 +17,7 @@ COMPRESS_EXT=.gz
 COMPRESS_PROG=gzip
 KEYFILE=/etc/backup-encryption-key
 BACKUPTMP=/var/backups/hcoop-backup-testing
+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 | \
@@ -149,14 +150,14 @@ cat volumes | \
     "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>' \