Merge branch 'master' of /git/ansible

This commit is contained in:
Patrick Uiterwijk 2013-12-13 21:57:29 +00:00
commit bd8f37aa8a
2 changed files with 27 additions and 6 deletions

View file

@ -6,10 +6,31 @@
export PATH=$PATH:/bin:/usr/bin:/usr/local/bin
MACHINES='signal.gnome.org webapps2.gnome.org clutter.gnome.org blogs.gnome.org chooser.gnome.org git.gnome.org webapps.gnome.org socket.gnome.org bugzilla-web.gnome.org progress.gnome.org clipboard.gnome.org drawable.gnome.org vbox.gnome.org cloud-ssh.gnome.org bastion.gnome.org spinner.gnome.org master.gnome.org combobox.gnome.org restaurant.gnome.org expander.gnome.org'
IPLESS_MACHINES='live.gnome.org extensions.gnome.org view.gnome.org puppet.gnome.org'
MACHINES='signal.gnome.org
webapps2.gnome.org
clutter.gnome.org
blogs.gnome.org
chooser.gnome.org
git.gnome.org
webapps.gnome.org
socket.gnome.org
bugzilla-web.gnome.org
progress.gnome.org
clipboard.gnome.org
drawable.gnome.org
vbox.gnome.org
cloud-ssh.gnome.org
bastion.gnome.org
spinner.gnome.org
master.gnome.org
combobox.gnome.org
restaurant.gnome.org
expander.gnome.org'
IPLESS_MACHINES='live.gnome.org
extensions.gnome.org
view.gnome.org
puppet.gnome.org'
BACKUP_DIR='/fedora_backups/gnome/'
LOGS_DIR='/fedora_backups/gnome/logs'
@ -18,13 +39,13 @@ BACKUP_USER='root'
OPTS='-avz -e "ssh -i /usr/local/etc/gnome_backup_id.rsa" --bwlimit=2000'
IPLESS_OPTS='-avz -e "ssh -A -i /usr/local/etc/gnome_backup_id.rsa bastion.gnome.org" --bwlimit=2000'
for MACHINE in "$MACHINES"; do
for MACHINE in $MACHINES; do
rsync $BACKUP_USER@$MACHINE:/etc/rsyncd/backup.exclude $BACKUP_DIR/excludes/$MACHINE.exclude
cd $BACKUP_DIR/$MACHINE
rsync $OPTS --exclude-from=$BACKUP_DIR/excludes/$MACHINE.exclude --log-file=$LOGS_DIR/$MACHINE.log $BACKUP_USER@$MACHINE_NAME:/ .
done
for MACHINE in "$IPLESS_MACHINES"; do
for MACHINE in $IPLESS_MACHINES; do
rsync $BACKUP_USER@$MACHINE:/etc/rsyncd/backup.exclude $BACKUP_DIR/excludes/$MACHINE.exclude
cd $BACKUP_DIR/$MACHINE
rsync $IPLESS_OPTS --exclude-from=$BACKUP_DIR/excludes/$MACHINE.exclude --log-file=$LOGS_DIR/$MACHINE.log $BACKUP_USER@$MACHINE_NAME:/ .

View file

@ -32,7 +32,7 @@
- name: Create GNOME backup user
user: name=gnomebackup state=present home=/fedora_backups/gnome/ createhome=yes shell=/sbin/nologin
- name: Add a Directory for the Excludes list
file: dest=/fedora/backups/gnoma/excludes owner=gnomebackup group=gnomebackup state=directory
file: dest=/fedora/backups/gnome/excludes owner=gnomebackup group=gnomebackup state=directory
- name: Add a Directory for the Log files
file: dest=/fedora_backups/gnome/logs owner=gnomebackup group=gnomebackup state=directory
- name: Install GNOME backup key