Sync hcoop-backup changes from megacz

diff --git a/hcoop-backup b/hcoop-backup
index 5f499b8..ce75ce5 100755 (executable)
--- a/hcoop-backup
+++ b/hcoop-backup
@@ -1,42 +1,42 @@
 #!/bin/bash -e
 
 #
-# run this script as root, on deleuze, in a directory that WILL NOT be
-# part of the backup (/tmp is a good choice).
+# it is dangerous to remove the "-e" above; please don't do that.
 #
 
-# FIXME:
-# postgres dumps
-# mysql dumps
+#
+# run this script as root, on deleuze
+#
 
-#umask 0644
+exec >& /var/log/backup-to-megacz.com-log
 
-# for catsync
-#PATH=$PATH:/home/megacz_admin/
+PATH=$PATH:/bin:/usr/bin:/sbin:/usr/sbin
 #COMPRESS_EXT=.bz2
 #COMPRESS_PROG=bzip2
 COMPRESS_EXT=.gz
 COMPRESS_PROG=gzip
 
-#KEYFILE=$1
+IFS=$'\n'
+
 KEYFILE=/etc/backup-encryption-key
-BACKUPDIR=/afs/megacz.com/hcoop-backup/
+BACKUPDIR=/afs/megacz.com/private/hcoop-backup/
 
 cd $BACKUPDIR
-find * -prune -ctime +2 -exec rm -rf {} \;
+find * -prune -ctime +1 -exec rm -rf {} \; || true
 
 SUBDIR=`date +%Y.%m.%d`
 rm -rf $SUBDIR
 mkdir -p $SUBDIR
 cd $SUBDIR
 
+groups
 echo 'I am in:'
 pwd
 echo
 
 echo building package lists...
 dpkg-query -W -f='${Package}\n' > packages
-(cd /; sudo find / /usr/ /usr/local/ /var/ -xdev)   | sort | uniq > allfiles
+(cd /; find / /usr/ /usr/local/ /var/ -xdev)   | sort | uniq > allfiles
 dpkg-query -W -f='${Package}\n'      | xargs dpkg -L | sort | uniq > debfiles
 dpkg-query -W -f='${Conffiles}\n'           | grep / | cut -b2- | sed 's_ .*__' | sort | uniq > conffiles
 
@@ -85,20 +85,6 @@ cat backupfiles | \
  grep -v ^/vmlinuz | \
  grep -v ^/vmlinuz.old | \
  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/ | \
  grep -v ^/dev/ | \
@@ -110,19 +96,13 @@ cat annoyingfiles | \
  grep -v ^/var/lib/mysql/ | \
  grep -v ^/var/lib/postgres/ | \
  grep -v ^/var/lib/postgresql/ | \
+ xargs -I{} -d\\n -- bash -c "test -L '{}' || echo '{}'" | \
  cat > complain
 
-grep '[a-z/]' complain && \
-  mail -a 'From: Adam Megacz <megacz@hcoop.net>' \
-       -s "automated message: annoying files found on deleuze (please do something about them)" admins@hcoop.net \
-       < complain
-
-cp backupfiles /tmp/backupfiles
-(cd /; sudo tar cvlpf - --ignore-failed-read --no-recursion -C / -T /tmp/backupfiles) | \
+tar clpf - --ignore-failed-read --no-recursion -C / -T backupfiles | \
   $COMPRESS_PROG | \
   ccrypt -k $KEYFILE -e | \
   catsync hcoop.backup.tar$COMPRESS_EXT.aescrypt
-du -chs hcoop.backup.tar$COMPRESS_EXT.aescrypt
 
 vos listvol deleuze | \
   tail -n +2 | \
@@ -130,30 +110,28 @@ vos listvol deleuze | \
   cut -b1-34 | \
   grep -v "\.backup .*$" | \
   grep -v "\.readonly .*$" | \
+  sed 's_^ .*__' | \
+  sed 's_ .*$__' | \
+  grep '[A-Za-z]' | \
   cat > volumes
 
-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..."
-  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
+cat volumes | \
+  grep -v not-backed-up | \
+  xargs -I{} -d\\n -- \
+  bash -c \
+    "vos dump -id {} -localauth -clone | $COMPRESS_PROG | ccrypt -k $KEYFILE -e | catsync {}.dump$COMPRESS_EXT.aescrypt"
+
+echo backing up databases
+tar -C /var/backups/databases/ -cf - . | \
+  $COMPRESS_PROG | \
+  ccrypt -k $KEYFILE -e \
+  | catsync databases.tar$COMPRESS_EXT.aescrypt
+
+grep '[a-z/]' complain && \
+  mail -a 'From: Adam Megacz <megacz@hcoop.net>' \
+       -s "automated message: annoying files found on deleuze (please do something about them)" admins@hcoop.net \
+       < complain \
+  || true
 
 echo done
 

diff --git a/hcoop-backup-wrapper b/hcoop-backup-wrapper
new file mode 100755 (executable)
index 0000000..76700d7
--- /dev/null
+++ b/hcoop-backup-wrapper
@@ -0,0 +1,13 @@
+#!/bin/bash
+
+exec >& /var/log/backup-to-megacz.com-wrapper-log
+touch /xyz/zys   # generate an error message
+
+fs checks -cell megacz.com
+fs checkvol
+rm -f /var/log/backup-to-megacz.com-log
+echo "groups before k5start" > /var/log/backup-to-megacz.com-log
+groups >> /var/log/backup-to-megacz.com-log
+export KINIT_PROG='aklog -c hcoop.net;aklog -c megacz.com'
+exec k5start -f /etc/keytabs/hcoop hcoop@HCOOP.NET -t \
+    /afs/hcoop.net/common/etc/scripts/hcoop-backup