Rampantly initial checkin of progress on backup scripts.

diff --git a/hcoop-backup b/hcoop-backup
index 0d1d520..9ecad5d 100755 (executable)
--- a/hcoop-backup
+++ b/hcoop-backup
@@ -8,7 +8,7 @@
 # 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
@@ -20,12 +20,20 @@ BWLIMIT=325
 
 IFS=$'\n'
 
+SCRIPTDIR=$(dirname $0)
 KEYFILE=/etc/backup-encryption-key
-BACKUPDIR=/afs/megacz.com/private/hcoop-backup
-BACKUPTMP=/var/backups/hcoop-backup
+BACKUPDIR=/hcoop.net-backups
+BACKUPTMP=/var/backups/hcoop-backup-testing
 SUBDIR=`date +%Y.%m.%d`
 
-#SYNC_CMD="rsync --bwlimit=$BWLIMIT --remove-source-files"
+S3_ACCESS_KEY=$(cat ~mwolson_admin/.amazon/access.key)
+S3_SECRET_KEY_FILE=~mwolson_admin/.amazon/secret.key
+
+function s3_cmd () {
+    local cmd=$1
+    shift
+    $SCRIPTDIR/s3-$cmd -k $S3_ACCESS_KEY -s $S3_SECRET_KEY_FILE $@
+}
 
 function copy_over () {
     # Move file to its offsite destination
@@ -39,15 +47,22 @@ function copy_over () {
     if test -n "$2"; then
         DEST=$DEST/$2
     fi
-    < $FILE catsync -b $BWLIMIT $DEST/$FILE
+    s3_cmd put -b ${BWLIMIT}K -T $FILE $DEST/$FILE
     rm -f $FILE
 }
 
-cd $BACKUPDIR
-find . -mindepth 1 -maxdepth 1 -type d -ctime +7 \
-    -execdir rm -fr '{}' \; || true
-rm -rf $SUBDIR
-mkdir -p $SUBDIR
+function prune_old_backups () {
+    local oldpwd=$PWD
+    cd $BACKUPDIR
+    find . -mindepth 1 -maxdepth 1 -type d -ctime +7 \
+        -execdir rm -fr '{}' \; || true
+    rm -rf $SUBDIR
+    mkdir -p $SUBDIR
+    cd $oldpwd
+}
+
+prune_old_backups
+
 mkdir -p $BACKUPTMP
 cd $BACKUPTMP
 

diff --git a/hcoop-backup-wrapper b/hcoop-backup-wrapper
dissimilarity index 72%
index 76700d7..fd51cfa 100755 (executable)
--- a/hcoop-backup-wrapper
+++ b/hcoop-backup-wrapper
@@ -1,13 +1,12 @@
-#!/bin/bash
-
-exec >& /var/log/backup-to-megacz.com-wrapper-log
-touch /xyz/zys   # generate an error message
-
-fs checks -cell megacz.com
-fs checkvol
-rm -f /var/log/backup-to-megacz.com-log
-echo "groups before k5start" > /var/log/backup-to-megacz.com-log
-groups >> /var/log/backup-to-megacz.com-log
-export KINIT_PROG='aklog -c hcoop.net;aklog -c megacz.com'
-exec k5start -f /etc/keytabs/hcoop hcoop@HCOOP.NET -t \
-    /afs/hcoop.net/common/etc/scripts/hcoop-backup
+#!/bin/bash
+
+exec >& /var/log/backup-to-s3-wrapper-log
+touch /xyz/zys   # generate an error message
+
+fs checkvol
+LOG=/var/log/backup-to-s3-log
+rm -f $LOG
+echo "groups before k5start" > $LOG
+groups >> $LOG
+exec k5start -f /etc/keytabs/hcoop hcoop@HCOOP.NET -t \
+    $(dirname $0)/hcoop-backup