infrastructure/ansible
2
0
Fork 0
Code Pull requests 7 Activity Actions

Merge the IPless machines into the global list of boxes to backup, also add an ssh_config file and populate it with ProxyCommand

Browse source
This commit is contained in:
Andrea Veri 2013-12-23 15:08:37 +00:00
parent 6059906447
commit 5b4564acd4
2 changed files with 9 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

15
files/gnome/backup.sh
View file

@ -24,9 +24,8 @@ MACHINES='signal.gnome.org
master.gnome.org master.gnome.org
combobox.gnome.org combobox.gnome.org
restaurant.gnome.org restaurant.gnome.org
expander.gnome.org' expander.gnome.org
live.gnome.org
IPLESS_MACHINES='live.gnome.org
extensions.gnome.org extensions.gnome.org
view.gnome.org view.gnome.org
puppet.gnome.org' puppet.gnome.org'
@ -41,14 +40,4 @@ for MACHINE in $MACHINES; do
rsync -avz -e "ssh -i /usr/local/etc/gnome_backup_id.rsa" --bwlimit=2000 --exclude-from=$BACKUP_DIR/excludes/$MACHINE.exclude --log-file=$LOGS_DIR/$MACHINE.log $BACKUP_USER@$MACHINE:/ . rsync -avz -e "ssh -i /usr/local/etc/gnome_backup_id.rsa" --bwlimit=2000 --exclude-from=$BACKUP_DIR/excludes/$MACHINE.exclude --log-file=$LOGS_DIR/$MACHINE.log $BACKUP_USER@$MACHINE:/ .
done done
for MACHINE in $IPLESS_MACHINES; do
rsync -avz -e "ssh -A -i /usr/local/etc/gnome_backup_id.rsa bastion.gnome.org" --bwlimit=2000 $BACKUP_USER@$MACHINE:/etc/rsyncd/backup.exclude $BACKUP_DIR/excludes/$MACHINE.exclude
cd $BACKUP_DIR/$MACHINE
rsync -avz -e "ssh -A -i /usr/local/etc/gnome_backup_id.rsa bastion.gnome.org" --bwlimit=2000 --exclude-from=$BACKUP_DIR/excludes/$MACHINE.exclude --log-file=$LOGS_DIR/$MACHINE.log $BACKUP_USER@$MACHINE:/ .
done
# Dailyreport needs the logs to generate the data we need.
cd $LOGS_DIR && scp -i /usr/local/etc/gnome_backup_id.rsa * $BACKUP_USER@combobox.gnome.org:/home/admin/backup-logs
rm -f $LOCKFILE

4
files/gnome/ssh_config Normal file
View file

@ -0,0 +1,4 @@
Host live.gnome.org extensions.gnome.org puppet.gnome.org view.gnome.org
User root
IdentityFile /usr/local/etc/gnome_backup_id.rsa
ProxyCommand ssh -W %h:%p root@bastion.gnome.org