hcoop-backup: Sync changes from megacz, add IFS lines

This should fix the weird "1.png" entries in the email that the script
sends out.

diff --git a/hcoop-backup b/hcoop-backup
index 90c9a1d..5f499b8 100755 (executable)
--- a/hcoop-backup
+++ b/hcoop-backup
@@ -9,17 +9,21 @@
 # postgres dumps
 # mysql dumps
 
+#umask 0644
+
 # for catsync
-PATH=$PATH:/home/megacz_admin/
-COMPRESS_EXT=.bz2
-COMPRESS_PROG=bzip2
+#PATH=$PATH:/home/megacz_admin/
+#COMPRESS_EXT=.bz2
+#COMPRESS_PROG=bzip2
+COMPRESS_EXT=.gz
+COMPRESS_PROG=gzip
 
 #KEYFILE=$1
 KEYFILE=/etc/backup-encryption-key
 BACKUPDIR=/afs/megacz.com/hcoop-backup/
 
 cd $BACKUPDIR
-find * -prune -ctime +5 -exec rm -rf {} \;
+find * -prune -ctime +2 -exec rm -rf {} \;
 
 SUBDIR=`date +%Y.%m.%d`
 rm -rf $SUBDIR
@@ -83,11 +87,17 @@ cat backupfiles | \
  grep -v '^/sbin/[a-z\-]*\.modutils$' | \
  cat > annoyingfiles-
 
+OLDIFS=$IFS
+IFS="
+"
+
 for A in `cat annoyingfiles-`
 do \
   test -L "$A" || echo "$A"
 done > annoyingfiles
 
+IFS=$OLDIFS
+
 cat annoyingfiles | \
  grep -v ^/opt/dell/srvadmin/ | \
  grep -v ^/boot/ | \
@@ -108,7 +118,7 @@ grep '[a-z/]' complain && \
        < complain
 
 cp backupfiles /tmp/backupfiles
-(cd /; sudo tar cvlpjf - --ignore-failed-read --no-recursion -C / -T /tmp/backupfiles) | \
+(cd /; sudo tar cvlpf - --ignore-failed-read --no-recursion -C / -T /tmp/backupfiles) | \
   $COMPRESS_PROG | \
   ccrypt -k $KEYFILE -e | \
   catsync hcoop.backup.tar$COMPRESS_EXT.aescrypt
@@ -122,17 +132,28 @@ vos listvol deleuze | \
   grep -v "\.readonly .*$" | \
   cat > volumes
 
-echo backing up databases
-tar -C /var/backups/databases/ -cf - . | \
-  $COMPRESS_PROG | \
-  ccrypt -k $KEYFILE -e \
-  | catsync databases.tar$COMPRESS_EXT.aescrypt
+echo volume list:
+cat volumes | grep -v not-backed-up
+
+IFS="
+"
 
 for A in `cat volumes | grep -v not-backed-up`
 do \
   echo "dumping afs volume $A..."
-  time (cd /; sudo vos dump -id $A -localauth -clone) | \
+  vos dump -id $A -localauth -clone | \
        $COMPRESS_PROG | \
        ccrypt -k $KEYFILE -e | \
        catsync $A.dump$COMPRESS_EXT.aescrypt
+  echo "  finished dumping afs volume $A."
 done
+
+# for some reason this has been causing the backups to abort...
+#echo backing up databases
+#tar -C /var/backups/databases/ -cf - . | \
+#  $COMPRESS_PROG | \
+#  ccrypt -k $KEYFILE -e \
+#  | catsync databases.tar$COMPRESS_EXT.aescrypt
+
+echo done
+