Move some of the configurations bits on the SSH config file and drop them from the backup script

This commit is contained in:
Andrea Veri 2013-12-23 16:08:29 +00:00
parent af5aa06684
commit 002135eb99
2 changed files with 6 additions and 3 deletions

View file

@ -32,12 +32,11 @@ MACHINES='signal.gnome.org
BACKUP_DIR='/fedora_backups/gnome/'
LOGS_DIR='/fedora_backups/gnome/logs'
BACKUP_USER='root'
for MACHINE in $MACHINES; do
rsync -avz -e "ssh -F /usr/local/etc/gnome_ssh_config -i /usr/local/etc/gnome_backup_id.rsa" --bwlimit=2000 $BACKUP_USER@$MACHINE:/etc/rsyncd/backup.exclude $BACKUP_DIR/excludes/$MACHINE.exclude
rsync -avz -e "ssh -F /usr/local/etc/gnome_ssh_config" --bwlimit=2000 $MACHINE:/etc/rsyncd/backup.exclude $BACKUP_DIR/excludes/$MACHINE.exclude
cd $BACKUP_DIR/$MACHINE
rsync -avz -e "ssh -F /usr/local/etc/gnome_ssh_config -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 -F /usr/local/etc/gnome_ssh_config" --bwlimit=2000 --exclude-from=$BACKUP_DIR/excludes/$MACHINE.exclude --log-file=$LOGS_DIR/$MACHINE.log $MACHINE:/ .
done

View file

@ -2,3 +2,7 @@ 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
Host *.gnome.org
User root
IdentityFile /usr/local/etc/gnome_backup_id.rsa