HCoop
/
hcoop
/
scripts.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
new-user fixes
[hcoop/scripts.git]
/
hcoop-backup
diff --git
a/hcoop-backup
b/hcoop-backup
index
83f9059
..
10afd41
100755
(executable)
--- a/
hcoop-backup
+++ b/
hcoop-backup
@@
-8,8
+8,6
@@
# run this script as root, on deleuze
#
# 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
PATH=$PATH:/bin:/usr/bin:/sbin:/usr/sbin
#COMPRESS_EXT=.bz2
#COMPRESS_PROG=bzip2
@@
-17,14
+15,20
@@
COMPRESS_EXT=.gz
COMPRESS_PROG=gzip
KEYFILE=/etc/backup-encryption-key
BACKUPTMP=/var/backups/hcoop-backup
COMPRESS_PROG=gzip
KEYFILE=/etc/backup-encryption-key
BACKUPTMP=/var/backups/hcoop-backup
-CURDATE=$(date +%Y.%m.%d)
+CURDATE=$(date
-u
+%Y.%m.%d)
-MOVE_OVER=$(dirname $0)/
s3-move
+MOVE_OVER=$(dirname $0)/
rsync.net-move-over
IFS=$'\n'
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
mkdir -p $BACKUPTMP
cd $BACKUPTMP
@@
-62,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/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/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/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
grep -v '^/usr/share/snmp/mibs/\.index$' | \
grep -v '^/usr/share/vim/addons/doc/tags$' \
> backupfiles
@@
-88,7
+94,7
@@
cat backupfiles | \
grep -v ^/vmlinuz | \
grep -v ^/vmlinuz.old | \
grep -v '^/sbin/[a-z\-]*\.modutils$' | \
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/ | \
grep -v ^/boot/ | \
grep -v ^/dev/ | \
grep -v ^/etc/ | \
@@
-99,14
+105,17
@@
cat backupfiles | \
grep -v ^/var/lib/mysql/ | \
grep -v ^/var/lib/postgres/ | \
grep -v ^/var/lib/postgresql/ | \
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
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
$COMPRESS_PROG | \
ccrypt -k $KEYFILE -e | \
$MOVE_OVER $CURDATE $F
+
# Acquire lock before messing with spamd
COUNT=0
LOCK=/var/local/lib/spamd/.lock
# Acquire lock before messing with spamd
COUNT=0
LOCK=/var/local/lib/spamd/.lock
@@
-131,19
+140,20
@@
rm -f $LOCK
< $F $MOVE_OVER $CURDATE $F
rm -f $F
< $F $MOVE_OVER $CURDATE $F
rm -f $F
-vos listvol
deleuze
| \
+vos listvol
fritz
| \
tail -n +2 | \
head -n -3 | \
tail -n +2 | \
head -n -3 | \
- cut -b1-3
4
| \
+ cut -b1-3
2
| \
grep -v "\.backup .*$" | \
grep -v "\.readonly .*$" | \
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 | \
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 ;
xargs -I{} -d\\n -- \
bash -e -c \
"F={}.dump$COMPRESS_EXT.aescrypt ;
@@
-158,6
+168,12
@@
tar -C /var/backups/databases/ -cf - . | \
ccrypt -k $KEYFILE -e | \
$MOVE_OVER $CURDATE $F
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 \
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 \