diff --git a/apache.yml b/apache.yml index 96c0882..3e0eb9d 100644 --- a/apache.yml +++ b/apache.yml @@ -1,20 +1,19 @@ - hosts: #- bugs.kde.org - code.kde.org - - elder.kde.org - library.kde.org - lxr.kde.org - mason.kde.org - mimi.kde.org - nellie.kde.org - olios.kde.org - orbi.kde.org - overwatch.kde.org - racnoss.kde.org - rosetta.kde.org - silk.kde.org - spring.kde.org - stumptown.kde.org roles: - apache diff --git a/backups.yml b/backups.yml index a338a31..edc0b2f 100644 --- a/backups.yml +++ b/backups.yml @@ -1,39 +1,38 @@ --- - hosts: - olios.kde.org - mason.kde.org - cano.kde.org - shrek.kde.org - overwatch.kde.org - bluemchen.kde.org - fiesta.kde.org - recluse.kde.org - code.kde.org - stumptown.kde.org - mimi.kde.org - gohma.kde.org - spring.kde.org - silk.kde.org - bugs.kde.org - nellie.kde.org - racnoss.kde.org - - elder.kde.org - orbi.kde.org - dalca.kde.org - ange.kde.org - pirate.kde.org - library.kde.org - rosetta.kde.org - letterbox.kde.org - thera.kde.org - mygalo.kde.org vars_files: - vars/backups.yml - vars/backups-vault.yml roles: - kde-backup diff --git a/letsencrypt.yml b/letsencrypt.yml index 524dcc8..466b5c7 100644 --- a/letsencrypt.yml +++ b/letsencrypt.yml @@ -1,15 +1,14 @@ - hosts: - silk.kde.org - olios.kde.org - rosetta.kde.org - library.kde.org - stumptown.kde.org - mimi.kde.org - code.kde.org - lxr.kde.org - - elder.kde.org - overwatch.kde.org #- spring.kde.org # spring needs some manual work first roles: - letsencrypt diff --git a/production/host_vars/elder.kde.org.yml b/production/host_vars/elder.kde.org.yml deleted file mode 100644 index d6eb71d..0000000 --- a/production/host_vars/elder.kde.org.yml +++ /dev/null @@ -1,4 +0,0 @@ ---- -backup_directory: backups -gohma_backup_user: elderbackup -gohma_backup_home: BACKUP.elder.kde.org diff --git a/production/hosts b/production/hosts index 0dd4a81..8f0aed3 100644 --- a/production/hosts +++ b/production/hosts @@ -1,83 +1,80 @@ #zivo.kde.org #shrek.kde.org bluemchen.kde.org cano.kde.org olios.kde.org fiesta.kde.org recluse.kde.org code.kde.org gohma.kde.org spring.kde.org silk.kde.org bugs.kde.org ange.kde.org lxr.kde.org joy.kde.org stumptown.kde.org dalca.kde.org dalca2.kde.org ansible_host=10.150.71.34 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 pirate.kde.org racnoss.kde.org mimi.kde.org orbi.kde.org letterbox.kde.org mason.kde.org -elder.kde.org thera.kde.org mygalo.kde.org darwini.kde.org aranea.kde.org artonis.kde.org anepsion.kde.org charlotte.kde.org eresida.kde.org [anongit] mason.kde.org anongit_style=legacy -elder.kde.org anongit_style=propagator [monitored] # Servers that are being monitored with Telegraf overwatch.kde.org #overwatch-test.kde.org bluemchen.kde.org rosetta.kde.org pirate.kde.org racnoss.kde.org mimi.kde.org gohma.kde.org -elder.kde.org orbi.kde.org recluse.kde.org code.kde.org silk.kde.org darwini.kde.org mason.kde.org ange.kde.org [monitoring-server] overwatch.kde.org #overwatch-test.kde.org diff --git a/roles/kde-backup/templates/backup-elder.sh b/roles/kde-backup/templates/backup-elder.sh deleted file mode 100755 index 1184d2c..0000000 --- a/roles/kde-backup/templates/backup-elder.sh +++ /dev/null @@ -1,11 +0,0 @@ -LOCATION=/root/{{backup_directory}} - -# Backup configuration and list of installed packages -tar -czf $LOCATION/etc.`date +%w`.tgz -C / etc/ -tar -czf $LOCATION/cronjobs.`date +%w`.tgz -C / var/spool/cron/ -dpkg -l > $LOCATION/dpkg.`date +%w` - -chmod -R 700 $LOCATION - -cd $LOCATION/.. -rsync --timeout=600 --delete -a backups -4 {{gohma_backup_user}}@gohma.kde.org: