X-Git-Url: http://git.hcoop.net/clinton/scripts.git/blobdiff_plain/c8f28654eb0a554e59d14a2c2c12ffe39f900f72..719a1db950a950713b410243566b5b482f51859b:/hcoop-backup

diff --git a/hcoop-backup b/hcoop-backup
index 9ce8a34..51da992 100755
--- a/hcoop-backup
+++ b/hcoop-backup
@@ -8,32 +8,35 @@
 # run this script as root, on deleuze
 #
 
-exec >& /var/log/backup-to-s3-log
-
 PATH=$PATH:/bin:/usr/bin:/sbin:/usr/sbin
 #COMPRESS_EXT=.bz2
 #COMPRESS_PROG=bzip2
 COMPRESS_EXT=.gz
 COMPRESS_PROG=gzip
 KEYFILE=/etc/backup-encryption-key
-BACKUPTMP=/var/backups/hcoop-backup-testing
-CURDATE=$(date +%Y.%m.%d)
+BACKUPTMP=/var/backups/hcoop-backup
+CURDATE=$(date -u +%Y.%m.%d)
 
-MOVE_OVER=$(dirname $0)/s3-move
+MOVE_OVER=$(dirname $0)/rsync.net-move-over
 
 IFS=$'\n'
 
-#prune_old_backups
+# Initialize storage area
+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
 cd $BACKUPTMP
 
 groups
-echo 'I am in:'
-pwd
+echo "I am in: $(pwd)"
 echo
 
-echo building package lists...
+echo "Building package lists..."
 dpkg-query -W -f='${Package}\n' > packages
 (cd /; find / /usr/ /usr/local/ /var/ -xdev)   | sort | uniq > allfiles
 dpkg-query -W -f='${Package}\n'      | xargs dpkg -L | sort | uniq > debfiles
@@ -89,7 +92,7 @@ cat backupfiles | \
  grep -v ^/vmlinuz | \
  grep -v ^/vmlinuz.old | \
  grep -v '^/sbin/[a-z\-]*\.modutils$' | \
- grep -v ^/opt/dell/srvadmin/ | \
+ grep -v ^/opt | \
  grep -v ^/boot/ | \
  grep -v ^/dev/ | \
  grep -v ^/etc/ | \
@@ -150,20 +153,25 @@ cat volumes | \
     "F={}.dump$COMPRESS_EXT.aescrypt ;
      vos dump -id {} -localauth -clone |
        $COMPRESS_PROG | ccrypt -k $KEYFILE -e |
-       $MOVE_OVER $CURDATE \$F"
+       $MOVE_OVER $CURDATE \$F" || :
 
-echo backing up databases
+echo "Backing up databases ..."
 F=databases.tar$COMPRESS_EXT.aescrypt
 tar -C /var/backups/databases/ -cf - . | \
   $COMPRESS_PROG | \
   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 \
        < complain \
-  || true
-
-echo done
+  || :
 
+echo "Done."