From af5aa06684bf49f9e9df7b58bd501b24afb16ebf Mon Sep 17 00:00:00 2001 From: Andrea Veri Date: Mon, 23 Dec 2013 16:04:32 +0000 Subject: [PATCH] Add an SSH configuration file for the IPless machines @ GNOME backups --- files/gnome/backup.sh | 4 ++-- playbooks/groups/backup-server.yml | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/files/gnome/backup.sh b/files/gnome/backup.sh index 40091c479a..30e12c26f4 100644 --- a/files/gnome/backup.sh +++ b/files/gnome/backup.sh @@ -35,9 +35,9 @@ LOGS_DIR='/fedora_backups/gnome/logs' BACKUP_USER='root' for MACHINE in $MACHINES; do - rsync -avz -e "ssh -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 -i /usr/local/etc/gnome_backup_id.rsa" --bwlimit=2000 $BACKUP_USER@$MACHINE:/etc/rsyncd/backup.exclude $BACKUP_DIR/excludes/$MACHINE.exclude cd $BACKUP_DIR/$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:/ . + 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:/ . done diff --git a/playbooks/groups/backup-server.yml b/playbooks/groups/backup-server.yml index 13a616928b..7beaea8d4d 100644 --- a/playbooks/groups/backup-server.yml +++ b/playbooks/groups/backup-server.yml @@ -38,6 +38,9 @@ - name: Add a Directory for the Log files file: dest=/fedora_backups/gnome/logs owner=gnomebackup group=gnomebackup state=directory + - name: Install the SSH configuration file + copy: src=$files/gnome/ssh_config dest=/usr/local/etc/gnome_ssh_config mode=0700 owner=gnomebackup + - name: Install GNOME backup key copy: src=${private}/files/gnome/backup_id.rsa dest=/usr/local/etc/gnome_backup_id.rsa mode=0600 owner=gnomebackup