diff --git a/files/gnome/backup.sh b/files/gnome/backup.sh index 6b43f26ee4..44e3bae798 100644 --- a/files/gnome/backup.sh +++ b/files/gnome/backup.sh @@ -33,11 +33,11 @@ IPLESS_MACHINES='live.gnome.org puppet.gnome.org' -BACKUP_DIR='/fedora_backup/gnome/' -LOGS_DIR='/fedora_backup/gnome/logs' +BACKUP_DIR='/fedora_backups/gnome/' +LOGS_DIR='/fedora_backups/gnome/logs' -OPTS='-avz -e "ssh -i /fedora_backup/gnome/backup_id.rsa" --bwlimit=2000' -IPLESS_OPTS='-avz -e "ssh -A -i /fedora_backup/gnome/backup_id.rsa bastion.gnome.org" --bwlimit=2000' +OPTS='-avz -e "ssh -i /fedora_backups/gnome/backup_id.rsa" --bwlimit=2000' +IPLESS_OPTS='-avz -e "ssh -A -i /fedora_backups/gnome/backup_id.rsa bastion.gnome.org" --bwlimit=2000' for MACHINE in "$MACHINES"; do rsync $MACHINE:/etc/rsyncd/backup.exclude $BACKUP_DIR/excludes/$MACHINE.exclude @@ -52,4 +52,4 @@ for MACHINE in "$IPLESS_MACHINES"; do done # Dailyreport needs the logs to generate the data we need. -cd $LOGS_DIR && scp -i /fedora_backup/gnome/backup_id.rsa * combobox.gnome.org:/home/admin/backup-logs +cd $LOGS_DIR && scp -i /fedora_backups/gnome/backup_id.rsa * combobox.gnome.org:/home/admin/backup-logs diff --git a/playbooks/groups/backup-server.yml b/playbooks/groups/backup-server.yml index eef2f65cf3..d050be931b 100644 --- a/playbooks/groups/backup-server.yml +++ b/playbooks/groups/backup-server.yml @@ -30,19 +30,19 @@ - include: $tasks/rdiff_backup_server.yml - name: Create GNOME backup user - user: name=gnomebackup state=present home=/fedora_backup/gnome/ createhome=yes shell=/sbin/nologin + 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-backup/gnome/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-backup/gnome/logs owner=gnomebackup group=gnomebackup state=directory + file: dest=/fedora-backups/gnome/logs owner=gnomebackup group=gnomebackup state=directory - name: Install GNOME backup key - file: src=${private}/gnome_backup_id.rsa path=/fedora_backup/gnome/backup_id.rsa mode=0600 + file: src=${private}/gnome_backup_id.rsa path=/fedora_backups/gnome/backup_id.rsa mode=0600 - name: Install GNOME backup script - file: src=$files/gnome/backup.sh path=/fedora_backup/gnome/backup.sh mode=0700 + file: src=$files/gnome/backup.sh path=/fedora_backups/gnome/backup.sh mode=0700 - name: Schedule the GNOME backup script - cron: name="Backup" hour=5 job="(cd /fedora_backup/gnome/; ./backup.sh)" user=gnomebackup + cron: name="Backup" hour=5 job="(cd /fedora_backups/gnome/; ./backup.sh)" user=gnomebackup - name: Add Directories - file: dest=/fedora-backup/gnome/{{ item }} owner=gnomebackup group=gnomebackup state=directory + file: dest=/fedora_backups/gnome/{{ item }} owner=gnomebackup group=gnomebackup state=directory with_items: - signal.gnome.org - webapps2.gnome.org