diff --git a/backups.yml b/backups.yml index 7b7d411..0187869 100644 --- a/backups.yml +++ b/backups.yml @@ -1,34 +1,33 @@ --- - hosts: - mason.kde.org - cano.kde.org - overwatch.kde.org - bluemchen.kde.org - fiesta.kde.org - recluse.kde.org - code.kde.org - stumptown.kde.org - mimi.kde.org - orbi.kde.org - dalca.kde.org - library.kde.org - rosetta.kde.org - letterbox.kde.org - thera.kde.org - mygalo.kde.org - komaci.kde.org - edulis.kde.org - platna.kde.org - milonia.kde.org - - eresida.kde.org - nicoda.kde.org - leptone.kde.org vars_files: - vars/backups.yml - vars/backups-vault.yml roles: - kde-backup diff --git a/production/host_vars/eresida.kde.org.yml b/production/host_vars/eresida.kde.org.yml deleted file mode 100644 index 48b549b..0000000 --- a/production/host_vars/eresida.kde.org.yml +++ /dev/null @@ -1,3 +0,0 @@ ---- -backup_directory: backups -hetzner_backup_host: anepsion diff --git a/production/hosts b/production/hosts index 4a68882..bbed4b3 100644 --- a/production/hosts +++ b/production/hosts @@ -1,88 +1,87 @@ #zivo.kde.org bluemchen.kde.org cano.kde.org seleno.kde.org fiesta.kde.org recluse.kde.org code.kde.org ange.kde.org stumptown.kde.org dalca.kde.org dalca2.kde.org ansible_host=10.150.44.2 ansible_ssh_common_args='-o ProxyCommand="ssh -W %h:%p -q root@dalca.kde.org"' overwatch.kde.org #overwatch-test.kde.org library.kde.org rosetta.kde.org mimi.kde.org orbi.kde.org letterbox.kde.org mason.kde.org thera.kde.org mygalo.kde.org darwini.kde.org arkyid.kde.org eucten.kde.org anepsion.kde.org charlotte.kde.org -eresida.kde.org halono.kde.org nephilia.kde.org komaci.kde.org edulis.kde.org nicoda.kde.org micrea.kde.org milonia.kde.org platna.kde.org capona.kde.org ctenzi.kde.org leptone.kde.org gallien.kde.org nemes.kde.org [anongit] mason.kde.org anongit_style=legacy [monitored] # Servers that are being monitored with Telegraf overwatch.kde.org #overwatch-test.kde.org bluemchen.kde.org rosetta.kde.org library.kde.org mimi.kde.org orbi.kde.org recluse.kde.org code.kde.org darwini.kde.org mason.kde.org thera.kde.org mygalo.kde.org anepsion.kde.org micrea.kde.org fiesta.kde.org nicoda.kde.org [monitoring-server] overwatch.kde.org #overwatch-test.kde.org diff --git a/roles/kde-backup/templates/backup-eresida.sh b/roles/kde-backup/templates/backup-eresida.sh deleted file mode 100644 index db207c3..0000000 --- a/roles/kde-backup/templates/backup-eresida.sh +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/bash -LOCATION=/root/{{backup_directory}} -find $LOCATION -name '*.tar' -mtime +7 | xargs rm -f - -# Backup configuration and list of installed packages -tar -czf $LOCATION/etc.`date +%w`.tgz -C / etc/ -tar -czf $LOCATION/crontabs.`date +%w`.tgz -C / var/spool/cron/ -dpkg -l > $LOCATION/dpkg.`date +%w` - -# Backup GitLab -tar -czf $LOCATION/gitlab-config.`date +%w`.tgz -C / srv/gitlab/gitlab/config - -sudo -u git -H sh -c 'cd /srv/gitlab/gitlab && bundle exec rake --trace gitlab:backup:create RAILS_ENV=production SKIP=repositories' &> backup.log -if [[ $? -ne 0 ]]; then cat backup.log; fi -mv /srv/gitlab/gitlab/tmp/backups/*gitlab_backup.tar $LOCATION/ - -# Transfer the backups to the backup server -lftp -f ~/bin/backup-options