X-Git-Url: http://git.hcoop.net/clinton/scripts.git/blobdiff_plain/0031afdd1cb29e44a5b596be266c2eff527501ba..ffb13c17d14a4a00908272cfa41cd63e8c858a10:/hcoop-backup

diff --git a/hcoop-backup b/hcoop-backup
index 51d4a79..6511c5a 100755
--- a/hcoop-backup
+++ b/hcoop-backup
@@ -25,6 +25,8 @@ IFS=$'\n'
 RSYNCDIR=/vicepa/hcoop-backups/files
 rm -fr $RSYNCDIR
 mkdir -p $RSYNCDIR/$CURDATE
+chmod og=rx,u=rwx $RSYNCDIR
+chmod og= $RSYNCDIR/$CURDATE
 
 # Initialize backup staging area
 mkdir -p $BACKUPTMP
@@ -64,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
@@ -101,6 +105,7 @@ 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
@@ -160,6 +165,12 @@ tar -C /var/backups/databases/ -cf - . | \
   ccrypt -k $KEYFILE -e | \
   $MOVE_OVER $CURDATE $F
 
+# Update file permissions so that rsync.net can access the backups
+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
 grep '[a-z/]' complain && \
   mail -a 'From: The Backup Program <backups@deleuze.hcoop.net>' \
        -s "automated message: annoying files found on deleuze (please do something about them)" admins@hcoop.net \