scripts/hcoop-backup: Update to latest version

diff --git a/hcoop-backup b/hcoop-backup
index 916bf1a..65d0bec 100755 (executable)
--- a/hcoop-backup
+++ b/hcoop-backup
@@ -9,14 +9,28 @@
 # postgres dumps
 # mysql dumps
 
+
 #KEYFILE=$1
 KEYFILE=/etc/backup-encryption-key
+BACKUPDIR=/afs/megacz.com/hcoop-backup/
+
+cd $BACKUPDIR
+find * -prune -ctime +5 -exec rm -rf {} \;
+
+SUBDIR=`date +%Y.%m.%d`
+rm -rf $SUBDIR
+mkdir -p $SUBDIR
+cd $SUBDIR
+
+echo 'I am in:'
+pwd
+echo
 
 echo building package lists...
-dpkg -W -f='${Package}\n' > packages
-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 / | sort | uniq > conffiles
+dpkg-query -W -f='${Package}\n' > packages
+(cd /; sudo 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
 
 diff allfiles debfiles | grep '^<' | cut -b 3- | \
  grep -v ^/var/cache | \
@@ -34,8 +48,16 @@ diff allfiles debfiles | grep '^<' | cut -b 3- | \
  grep -v '^/$' | \
  grep -v '^/usr/$' | \
  grep -v ^/usr/src | \
+ grep -v '^/usr/.*pyc' | \
+ grep -v '^/usr/.*elc' | \
+ grep -v '^/usr/share/info/dir$' | \
+ grep -v '^/usr/share/info/dir.old$' | \
+ grep -v '^/usr/share/emacs21/site-lisp/' | \
+ grep -v '^/usr/share/emacs22/site-lisp/' | \
  cat > backupfiles
 
+cat conffiles >> backupfiles
+
 cat backupfiles | \
  grep -v ^/home | \
  grep -v ^/usr/local | \
@@ -45,6 +67,7 @@ cat backupfiles | \
  grep -v ^/var/lib/python-support | \
  grep -v ^/usr/share/man | \
  grep -v ^/media | \
+ grep -v ^/usr/lib/locale/locale-archive | \
  grep -v ^/vmlinuz | \
  grep -v ^/vmlinuz.old | \
  grep -v '^/sbin/[a-z\-]*.modutils$' | \
@@ -58,6 +81,7 @@ done > annoyingfiles
 cat annoyingfiles | \
  grep -v ^/opt/dell/srvadmin/ | \
  grep -v ^/boot/ | \
+ grep -v ^/dev/ | \
  grep -v ^/etc/ | \
  grep -v ^/root/ | \
  grep -v ^/var/ | \
@@ -68,16 +92,37 @@ cat annoyingfiles | \
  grep -v ^/var/lib/postgresql/ | \
  cat > complain
 
-mail -a 'From: Adam Megacz <megacz@hcoop.net>' \
-     -s "annoying files found on deleuze (please do something about them)" admins@hcoop.net \
-     < 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 cvlpjf - --ignore-failed-read --no-recursion -C / -T /tmp/backupfiles) | \
+  gzip | \
+  ccrypt -k $KEYFILE -e \
+  > hcoop.backup.tar.gz.aescrypt
+du -chs hcoop.backup.tar.gz.aescrypt
 
-tar cvlpjf - -C / -T backupfiles | bzip2 | ccrypt -k $KEYFILE -e > hcoop.backup.tar.bz2.aescrypt
-du -chs hcoop.backup.tar.bz2.aescrypt
+vos listvol deleuze | \
+  grep -v common.debian | \
+  tail -n +2 | \
+  head -n -3 | \
+  cut -b1-34 | \
+  grep -v "\.backup .*$" | \
+  grep -v "\.readonly .*$" \
+  > volumes
+
+for A in mysql postgres; do \
+echo backing up $A
+tar -C /var/backups/databases/$A -cf - | \
+  gzip | \
+  ccrypt -k $KEYFILE -e \
+  > database-$A.backup.tar.gz.aescrypt
+done
 
-vos listvol deleuze | tail -n +2 | head -n -3 | cut -b1-34 | grep -v "\.backup .*$" | grep -v "\.readonly .*$" > volumes
 for A in `cat volumes`
 do \
   echo "dumping afs volume $A..."
-  time vos dump -id $A -localauth -clone | bzip2 | ccrypt -k $KEYFILE -e > $A.dump.bz2.aescrypt
+  time (cd /; sudo vos dump -id $A -localauth -clone) | gzip | ccrypt -k $KEYFILE -e > $A.dump.gz.aescrypt
 done