Update of /cvsroot/hcoop/misc/scripts
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv24266
Modified Files:
change-user-password hcoop-backup make-account-for-fyodor-user
Log Message:
Index: change-user-password
===================================================================
RCS file: /cvsroot/hcoop/misc/scripts/change-user-password,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** change-user-password 9 Oct 2007 19:56:47 -0000 1.3
--- change-user-password 4 Apr 2009 13:30:29 -0000 1.4
***************
*** 1,3 ****
! #!/bin/bash -ex
#
# Finally, set password for main user's principal
--- 1,5 ----
! #!/bin/bash -e
!
! # disable debug !/bin/bash -ex
#
# Finally, set password for main user's principal
Index: hcoop-backup
===================================================================
RCS file: /cvsroot/hcoop/misc/scripts/hcoop-backup,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** hcoop-backup 15 Jan 2008 00:08:06 -0000 1.10
--- hcoop-backup 4 Apr 2009 13:30:29 -0000 1.11
***************
*** 9,14 ****
#
- exec >& /var/log/backup-to-megacz.com-log
-
PATH=$PATH:/bin:/usr/bin:/sbin:/usr/sbin
#COMPRESS_EXT=.bz2
--- 9,12 ----
***************
*** 16,43 ****
COMPRESS_EXT=.gz
COMPRESS_PROG=gzip
! IFS=$'\n'
! KEYFILE=/etc/backup-encryption-key
! BACKUPDIR=/afs/megacz.com/private/hcoop-backup/
! cd $BACKUPDIR
! find * -prune -ctime +1 -exec rm -rf {} \; || true
! SUBDIR=`date +%Y.%m.%d`
! rm -rf $SUBDIR
! mkdir -p $SUBDIR
! cd $SUBDIR
groups
! echo 'I am in:'
! pwd
echo
! 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
diff allfiles debfiles | grep '^<' | cut -b 3- | \
--- 14,46 ----
COMPRESS_EXT=.gz
COMPRESS_PROG=gzip
+ KEYFILE=/etc/backup-encryption-key
+ BACKUPTMP=/var/backups/hcoop-backup
+ CURDATE=$(date -u +%Y.%m.%d)
! MOVE_OVER=$(dirname $0)/rsync.net-move-over
! IFS=$'\n'
! # 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
! 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
diff allfiles debfiles | grep '^<' | cut -b 3- | \
***************
*** 47,50 ****
--- 50,54 ----
grep -v ^/var/backups | \
grep -v ^/var/lib/changetrack | \
+ grep -v ^/var/local/lib/spamd | \
grep -v ^/var/run | \
grep -v ^/var/lock | \
***************
*** 63,74 ****
grep -v '^/usr/lib/courier/.*\.rand$' | \
grep -v '^/usr/lib/gconv/gconv-modules\.cache$' | \
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/vim/addons/doc/tags$' | \
! cat > backupfiles
cat conffiles >> backupfiles
--- 67,81 ----
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/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
cat conffiles >> backupfiles
***************
*** 81,84 ****
--- 88,92 ----
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 | \
***************
*** 87,91 ****
grep -v ^/vmlinuz.old | \
grep -v '^/sbin/[a-z\-]*\.modutils$' | \
! grep -v ^/opt/dell/srvadmin/ | \
grep -v ^/boot/ | \
grep -v ^/dev/ | \
--- 95,99 ----
grep -v ^/vmlinuz.old | \
grep -v '^/sbin/[a-z\-]*\.modutils$' | \
! grep -v ^/opt | \
grep -v ^/boot/ | \
grep -v ^/dev/ | \
***************
*** 98,108 ****
grep -v ^/var/lib/postgres/ | \
grep -v ^/var/lib/postgresql/ | \
! xargs -I{} -d\\n -- bash -c "test -L '{}' || echo '{}'" | \
! cat > complain
tar clpf - --ignore-failed-read --no-recursion -C / -T backupfiles | \
$COMPRESS_PROG | \
ccrypt -k $KEYFILE -e | \
! catsync hcoop.backup.tar$COMPRESS_EXT.aescrypt
vos listvol deleuze | \
--- 106,140 ----
grep -v ^/var/lib/postgres/ | \
grep -v ^/var/lib/postgresql/ | \
! 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 | \
! $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 | \
***************
*** 114,138 ****
sed 's_^ .*__' | \
sed 's_ .*$__' | \
! grep '[A-Za-z]' | \
! cat > 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"
! echo backing up databases
tar -C /var/backups/databases/ -cf - . | \
$COMPRESS_PROG | \
! ccrypt -k $KEYFILE -e \
! | catsync databases.tar$COMPRESS_EXT.aescrypt
grep '[a-z/]' complain && \
! mail -a 'From: Adam Megacz <meg...@hcoop.net>' \
-s "automated message: annoying files found on deleuze (please do
something about them)" adm...@hcoop.net \
< complain \
! || true
!
! echo done
--- 146,179 ----
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 ;
! 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 | \
! $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 <back...@deleuze.hcoop.net>' \
-s "automated message: annoying files found on deleuze (please do
something about them)" adm...@hcoop.net \
< complain \
! || :
+ echo "Done."
Index: make-account-for-fyodor-user
===================================================================
RCS file: /cvsroot/hcoop/misc/scripts/make-account-for-fyodor-user,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** make-account-for-fyodor-user 23 Oct 2007 16:43:29 -0000 1.9
--- make-account-for-fyodor-user 4 Apr 2009 13:30:29 -0000 1.10
***************
*** 13,20 ****
ssh $ad...@fyodor.hcoop.net "sudo cat /home/$USER/.mire-password" || \
(echo == sending complaint to $u...@hcoop.net
====================================================;\
! echo 'please have a fyodor admin fix it (Adam Megacz is not a fyodor
admin)' |\
mail -a 'From: Adam Megacz <meg...@hcoop.net>' \
-c adm...@hcoop.net \
! -s "you have damaged the permissions on your ~/.mire-password"
$u...@hcoop.net)
ssh $ad...@fyodor.hcoop.net 'sudo cat /home/$USER/.mire-password' && \
create-user $USER && \
--- 13,20 ----
ssh $ad...@fyodor.hcoop.net "sudo cat /home/$USER/.mire-password" || \
(echo == sending complaint to $u...@hcoop.net
====================================================;\
! cat /etc/migration-prob-message |\
mail -a 'From: Adam Megacz <meg...@hcoop.net>' \
-c adm...@hcoop.net \
! -s "HCoop.net automatic account creation output" $u...@hcoop.net)
ssh $ad...@fyodor.hcoop.net 'sudo cat /home/$USER/.mire-password' && \
create-user $USER && \
------------------------------------------------------------------------------
_______________________________________________
hcoop-cvs mailing list
hcoop-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/hcoop-cvs
