hcoop-backup: Update log location.

[clinton/scripts.git] / hcoop-backup

diff --git a/hcoop-backup b/hcoop-backup
index 366efef..113539a 100755 (executable)
--- a/hcoop-backup
+++ b/hcoop-backup
@@ -8,7 +8,7 @@
 # run this script as root, on deleuze
 #
 
-exec >& /var/log/backup-to-s3-log
+exec >& /var/log/backup-to-rsync-log
 
 PATH=$PATH:/bin:/usr/bin:/sbin:/usr/sbin
 #COMPRESS_EXT=.bz2
@@ -19,12 +19,16 @@ KEYFILE=/etc/backup-encryption-key
 BACKUPTMP=/var/backups/hcoop-backup
 CURDATE=$(date +%Y.%m.%d)
 
-MOVE_OVER=$(dirname $0)/s3-move
+MOVE_OVER=$(dirname $0)/rsync.net-move-over
 
 IFS=$'\n'
 
-#prune_old_backups
+# Initialize storage area
+RSYNCDIR=/vicepa/hcoop-backups/files
+rm -fr $RSYNCDIR
+mkdir -p $RSYNCDIR/$CURDATE
 
+# Initialize backup staging area
 mkdir -p $BACKUPTMP
 cd $BACKUPTMP
 
@@ -88,7 +92,7 @@ cat backupfiles | \
  grep -v ^/vmlinuz | \
  grep -v ^/vmlinuz.old | \
  grep -v '^/sbin/[a-z\-]*\.modutils$' | \
- grep -v ^/opt/dell/srvadmin/ | \
+ grep -v ^/opt | \
  grep -v ^/boot/ | \
  grep -v ^/dev/ | \
  grep -v ^/etc/ | \
@@ -145,11 +149,11 @@ 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 $CURDATE \$F"
+       $MOVE_OVER $CURDATE \$F" || :
 
 echo "Backing up databases ..."
 F=databases.tar$COMPRESS_EXT.aescrypt