X-Git-Url: http://git.hcoop.net/clinton/scripts.git/blobdiff_plain/0fe4060a9f19677cad407d3a0246ec8a2a221fcd..487d87d336c664484d8653a9adb666ca2c49a273:/hcoop-backup

diff --git a/hcoop-backup b/hcoop-backup
index 31dc4f2..10afd41 100755
--- a/hcoop-backup
+++ b/hcoop-backup
@@ -25,7 +25,7 @@ IFS=$'\n'
 RSYNCDIR=/vicepa/hcoop-backups/files
 rm -fr $RSYNCDIR
 mkdir -p $RSYNCDIR/$CURDATE
-chmod og=rx $RSYNCDIR
+chmod og=rx,u=rwx $RSYNCDIR
 chmod og= $RSYNCDIR/$CURDATE
 
 # Initialize backup staging area
@@ -66,12 +66,14 @@ diff allfiles debfiles | grep '^<' | cut -b 3- | \
  grep -v '^/usr/bin/.*\.notslocate$' | \
  grep -v '^/usr/lib/courier/.*\.rand$' | \
  grep -v '^/usr/lib/gconv/gconv-modules\.cache$' | \
+ grep -v '^/usr/lib/ghc[^/*]/package\.conf$' | \
+ grep -v '^/usr/lib/ghc[^/*]/package\.conf\.old$' | \
  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/emacs21/site-lisp/' | \
  grep -v '^/usr/share/emacs22/site-lisp/' | \
+ grep -v '^/usr/share/info/dir$' | \
+ grep -v '^/usr/share/info/dir\.old$' | \
  grep -v '^/usr/share/snmp/mibs/\.index$' | \
  grep -v '^/usr/share/vim/addons/doc/tags$' \
  > backupfiles
@@ -103,14 +105,17 @@ cat backupfiles | \
  grep -v ^/var/lib/mysql/ | \
  grep -v ^/var/lib/postgres/ | \
  grep -v ^/var/lib/postgresql/ | \
+ grep -v ^/usr/lib/ghc-6.6/ | \
  xargs -I{} -d\\n -- bash -c "test -L '{}' || echo '{}'" > complain
 
 F=hcoop.backup.tar$COMPRESS_EXT.aescrypt
-tar clpf - --ignore-failed-read --no-recursion -C / -T backupfiles | \
+echo $COMPRESS_PROG $KEYFILE $MOVE_OVER $CURDATE $F
+echo tar clpf - --ignore-failed-read --no-recursion -C / -T backupfiles | \
   $COMPRESS_PROG | \
   ccrypt -k $KEYFILE -e | \
   $MOVE_OVER $CURDATE $F
 
+
 # Acquire lock before messing with spamd
 COUNT=0
 LOCK=/var/local/lib/spamd/.lock
@@ -135,19 +140,20 @@ rm -f $LOCK
 < $F $MOVE_OVER $CURDATE $F
 rm -f $F
 
-vos listvol deleuze | \
+vos listvol fritz | \
   tail -n +2 | \
   head -n -3 | \
-  cut -b1-34 | \
+  cut -b1-32 | \
   grep -v "\.backup .*$" | \
   grep -v "\.readonly .*$" | \
+  grep -v "\.d .*$" | \
+  grep -v not-backed-up | \
   sed 's_^ .*__' | \
   sed 's_ .*$__' | \
   grep '[A-Za-z]' \
   > volumes
 
 cat volumes | \
-  grep -v not-backed-up | \
   xargs -I{} -d\\n -- \
   bash -e -c \
     "F={}.dump$COMPRESS_EXT.aescrypt ;
@@ -163,8 +169,8 @@ tar -C /var/backups/databases/ -cf - . | \
   $MOVE_OVER $CURDATE $F
 
 # Update file permissions so that rsync.net can access the backups
-chmod -R go=,u-w $RSYNCDIR
-chmod u+w $RSYNCDIR $RSYNCDIR/$CURDATE
+chmod -R go=,u-w $RSYNCDIR/$CURDATE
+chmod u+w $RSYNCDIR/$CURDATE
 chown -R rsync $RSYNCDIR/$CURDATE
 
 # Complain to admins if there are unknown files