X-Git-Url: https://git.hcoop.net/hcoop/scripts.git/blobdiff_plain/24b2faa62c8b400bfee86ca6b27339aed65fc119..4c237a2485281a1d7141162ec88890d2e17b2445:/hcoop-backup

diff --git a/hcoop-backup b/hcoop-backup
index 65d0bec..dc67a9e 100755
--- a/hcoop-backup
+++ b/hcoop-backup
@@ -9,6 +9,10 @@
 # postgres dumps
 # mysql dumps
 
+# for catsync
+PATH=$PATH:/home/megacz_admin/
+COMPRESS_EXT=.bz2
+COMPRESS_PROG=bzip2
 
 #KEYFILE=$1
 KEYFILE=/etc/backup-encryption-key
@@ -48,12 +52,17 @@ 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/.*\.pyc' | \
+ grep -v '^/usr/.*\.elc' | \
+ grep -v '^/usr/bin/perldoc\.stub$' | \
+ grep -v '^/usr/lib/gconv/gconv-modules\.cache$' | \
+ grep -v '^/usr/lib/graphviz/config$' | \
+ grep -v '^/usr/lib/locale/locale-archive$' | \
  grep -v '^/usr/share/info/dir$' | \
- grep -v '^/usr/share/info/dir.old$' | \
+ grep -v '^/usr/share/info/dir\.old$' | \
  grep -v '^/usr/share/emacs21/site-lisp/' | \
  grep -v '^/usr/share/emacs22/site-lisp/' | \
+ grep -v '^/usr/share/vim/addons/doc/tags$' | \
  cat > backupfiles
 
 cat conffiles >> backupfiles
@@ -66,11 +75,11 @@ cat backupfiles | \
  grep -v ^/usr/lib/python2.4/ | \
  grep -v ^/var/lib/python-support | \
  grep -v ^/usr/share/man | \
+ grep -v ^/usr/share/perl5/IkiWiki/Plugin | \
  grep -v ^/media | \
- grep -v ^/usr/lib/locale/locale-archive | \
  grep -v ^/vmlinuz | \
  grep -v ^/vmlinuz.old | \
- grep -v '^/sbin/[a-z\-]*.modutils$' | \
+ grep -v '^/sbin/[a-z\-]*\.modutils$' | \
  cat > annoyingfiles-
 
 for A in `cat annoyingfiles-`
@@ -99,30 +108,30 @@ grep '[a-z/]' 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
+  $COMPRESS_PROG | \
+  ccrypt -k $KEYFILE -e | \
+  catsync hcoop.backup.tar$COMPRESS_EXT.aescrypt
+du -chs hcoop.backup.tar$COMPRESS_EXT.aescrypt
 
 vos listvol deleuze | \
-  grep -v common.debian | \
   tail -n +2 | \
   head -n -3 | \
   cut -b1-34 | \
   grep -v "\.backup .*$" | \
-  grep -v "\.readonly .*$" \
-  > volumes
+  grep -v "\.readonly .*$" | \
+  cat > volumes
 
-for A in mysql postgres; do \
-echo backing up $A
-tar -C /var/backups/databases/$A -cf - | \
-  gzip | \
+echo backing up databases
+tar -C /var/backups/databases/ -cf - . | \
+  $COMPRESS_PROG | \
   ccrypt -k $KEYFILE -e \
-  > database-$A.backup.tar.gz.aescrypt
-done
+  | catsync databases.tar$COMPRESS_EXT.aescrypt
 
-for A in `cat volumes`
+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) | gzip | ccrypt -k $KEYFILE -e > $A.dump.gz.aescrypt
+  time (cd /; sudo vos dump -id $A -localauth -clone) | \
+       $COMPRESS_PROG | \
+       ccrypt -k $KEYFILE -e | \
+       catsync $A.dump$COMPRESS_EXT.aescrypt
 done