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

diff --git a/hcoop-backup b/hcoop-backup
index 934c257..5340f8e 100755
--- a/hcoop-backup
+++ b/hcoop-backup
@@ -16,7 +16,7 @@ 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
@@ -29,11 +29,10 @@ mkdir -p $BACKUPTMP
 cd $BACKUPTMP
 
 groups
-echo 'I am in:'
-pwd
+echo "I am in: $(pwd)"
 echo
 
-echo building package lists...
+echo "Building package lists..."
 dpkg-query -W -f='${Package}\n' > packages
 (cd /; find / /usr/ /usr/local/ /var/ -xdev)   | sort | uniq > allfiles
 dpkg-query -W -f='${Package}\n'      | xargs dpkg -L | sort | uniq > debfiles
@@ -89,7 +88,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/ | \
@@ -146,13 +145,13 @@ 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
+echo "Backing up databases ..."
 F=databases.tar$COMPRESS_EXT.aescrypt
 tar -C /var/backups/databases/ -cf - . | \
   $COMPRESS_PROG | \
@@ -163,7 +162,6 @@ grep '[a-z/]' complain && \
   mail -a 'From: The Backup Program <backups@deleuze.hcoop.net>' \
        -s "automated message: annoying files found on deleuze (please do something about them)" admins@hcoop.net \
        < complain \
-  || true
-
-echo done
+  || :
 
+echo "Done."