hcoop-backup: Keep track of date.

[hcoop/scripts.git] / hcoop-backup

diff --git a/hcoop-backup b/hcoop-backup
index 94ddd8d..934c257 100755 (executable)
--- a/hcoop-backup
+++ b/hcoop-backup
@@ -8,26 +8,25 @@
 # run this script as root, on deleuze
 #
 
-exec >& /var/log/backup-to-megacz.com-log
+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)
 
-IFS=$'\n'
+MOVE_OVER=$(dirname $0)/s3-move
 
-KEYFILE=/etc/backup-encryption-key
-BACKUPDIR=/afs/megacz.com/private/hcoop-backup/
+IFS=$'\n'
 
-cd $BACKUPDIR
-find * -prune -ctime +2 -exec rm -rf {} \; || true
+#prune_old_backups
 
-SUBDIR=`date +%Y.%m.%d`
-rm -rf $SUBDIR
-mkdir -p $SUBDIR
-cd $SUBDIR
+mkdir -p $BACKUPTMP
+cd $BACKUPTMP
 
 groups
 echo 'I am in:'
@@ -38,7 +37,8 @@ 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
-dpkg-query -W -f='${Conffiles}\n'           | grep / | cut -b2- | sed 's_ .*__' | sort | uniq > conffiles
+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 | \
@@ -46,6 +46,7 @@ diff allfiles debfiles | grep '^<' | cut -b 3- | \
  grep -v ^/var/lib/dpkg | \
  grep -v ^/var/backups | \
  grep -v ^/var/lib/changetrack | \
+ grep -v ^/var/local/lib/spamd | \
  grep -v ^/var/run | \
  grep -v ^/var/lock | \
  grep -v ^/var/lib/ucf | \
@@ -68,8 +69,9 @@ diff allfiles debfiles | grep '^<' | cut -b 3- | \
  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
+ grep -v '^/usr/share/snmp/mibs/\.index$' | \
+ grep -v '^/usr/share/vim/addons/doc/tags$' \
+ > backupfiles
 
 cat conffiles >> backupfiles
 
@@ -80,6 +82,7 @@ cat backupfiles | \
  grep -v ^/var/log | \
  grep -v ^/usr/lib/python2.4/ | \
  grep -v ^/var/lib/python-support | \
+ grep -v ^/usr/share/jed/lib | \
  grep -v ^/usr/share/man | \
  grep -v ^/usr/share/perl5/IkiWiki/Plugin | \
  grep -v ^/media | \
@@ -97,13 +100,37 @@ cat backupfiles | \
  grep -v ^/var/lib/mysql/ | \
  grep -v ^/var/lib/postgres/ | \
  grep -v ^/var/lib/postgresql/ | \
- xargs -I{} -d\\n -- bash -c "test -L '{}' || echo '{}'" | \
- cat > complain
+ 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 | \
   $COMPRESS_PROG | \
   ccrypt -k $KEYFILE -e | \
-  catsync hcoop.backup.tar$COMPRESS_EXT.aescrypt
+  $MOVE_OVER $CURDATE $F
+
+# Acquire lock before messing with spamd
+COUNT=0
+LOCK=/var/local/lib/spamd/.lock
+while test -f $LOCK; do
+    sleep 2m
+    COUNT=$(expr $COUNT + 1)
+    if test $COUNT -eq 10; then
+        # Enough waiting.  Kill the process.
+        P=$(cat $LOCK) || :
+        test -n "$P" && kill $P || :
+        rm -f $LOCK
+        break
+    fi
+done
+touch $LOCK
+
+F=common.spamd.tar$COMPRESS_EXT.aescrypt
+tar clpf - --ignore-failed-read -C / /var/local/lib/spamd | \
+  $COMPRESS_PROG | \
+  ccrypt -k $KEYFILE -e > $F
+rm -f $LOCK
+< $F $MOVE_OVER $CURDATE $F
+rm -f $F
 
 vos listvol deleuze | \
   tail -n +2 | \
@@ -113,23 +140,27 @@ vos listvol deleuze | \
   grep -v "\.readonly .*$" | \
   sed 's_^ .*__' | \
   sed 's_ .*$__' | \
-  grep '[A-Za-z]' | \
-  cat > volumes
+  grep '[A-Za-z]' \
+  > volumes
 
 cat volumes | \
   grep -v not-backed-up | \
   xargs -I{} -d\\n -- \
   bash -c \
-    "vos dump -id {} -localauth -clone | $COMPRESS_PROG | ccrypt -k $KEYFILE -e | catsync {}.dump$COMPRESS_EXT.aescrypt"
+    "F={}.dump$COMPRESS_EXT.aescrypt ;
+     vos dump -id {} -localauth -clone |
+       $COMPRESS_PROG | ccrypt -k $KEYFILE -e |
+       $MOVE_OVER $CURDATE \$F"
 
 echo backing up databases
+F=databases.tar$COMPRESS_EXT.aescrypt
 tar -C /var/backups/databases/ -cf - . | \
   $COMPRESS_PROG | \
-  ccrypt -k $KEYFILE -e \
-  | catsync databases.tar$COMPRESS_EXT.aescrypt
+  ccrypt -k $KEYFILE -e | \
+  $MOVE_OVER $CURDATE $F
 
 grep '[a-z/]' complain && \
-  mail -a 'From: Adam Megacz <megacz@hcoop.net>' \
+  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