HCoop
/
clinton
/
scripts.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
hcoop-kprop: update for fritz
[clinton/scripts.git]
/
hcoop-backup
diff --git
a/hcoop-backup
b/hcoop-backup
index
2b26d80
..
6511c5a
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,7
+15,7
@@
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)/rsync.net-move-over
MOVE_OVER=$(dirname $0)/rsync.net-move-over
@@
-27,6
+25,8
@@
IFS=$'\n'
RSYNCDIR=/vicepa/hcoop-backups/files
rm -fr $RSYNCDIR
mkdir -p $RSYNCDIR/$CURDATE
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
# Initialize backup staging area
mkdir -p $BACKUPTMP
@@
-66,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
@@
-103,6
+105,7
@@
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
@@
-162,6
+165,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 \