diff options
| -rw-r--r-- | inventory/backups | 2 | ||||
| -rw-r--r-- | inventory/host_vars/batcave01.phx2.fedoraproject.org | 2 | ||||
| -rw-r--r-- | inventory/inventory | 4 | ||||
| -rw-r--r-- | playbooks/manual/push-badges.yml | 4 | ||||
| -rw-r--r-- | playbooks/manual/staging-sync/lookaside.yml | 2 | ||||
| -rw-r--r-- | playbooks/transient_cloud_instance.yml | 2 | ||||
| -rwxr-xr-x | roles/base/files/common-scripts/syncFiles.sh | 2 | ||||
| -rw-r--r-- | roles/nagios_server/files/nagios/hosts/batcave01.cfg | 7 | ||||
| -rw-r--r-- | roles/nagios_server/files/nagios/hosts/lockbox01.cfg | 14 | ||||
| -rwxr-xr-x | scripts/public-db-copy | 2 |
10 files changed, 24 insertions, 17 deletions
diff --git a/inventory/backups b/inventory/backups index 0a1753ba2..9fab5c26f 100644 --- a/inventory/backups +++ b/inventory/backups @@ -9,7 +9,7 @@ db-datanommer02.phx2.fedoraproject.org db-fas01.phx2.fedoraproject.org hosted03.fedoraproject.org hosted-lists01.fedoraproject.org -lockbox01.phx2.fedoraproject.org +batcave01.phx2.fedoraproject.org pagure01.fedoraproject.org people01.fedoraproject.org pkgs02.phx2.fedoraproject.org diff --git a/inventory/host_vars/batcave01.phx2.fedoraproject.org b/inventory/host_vars/batcave01.phx2.fedoraproject.org index b640d39db..7cc0d4814 100644 --- a/inventory/host_vars/batcave01.phx2.fedoraproject.org +++ b/inventory/host_vars/batcave01.phx2.fedoraproject.org @@ -16,6 +16,8 @@ datacenter: phx2 # reverse-dns was pointing elsewhere so we had to hardcode this. fedmsg_fqdn: batcave01.phx2.fedoraproject.org +host_backup_targets: ['/git', '/mnt/fedora/app/attachments'] + # # We need this to install with 2 nics # diff --git a/inventory/inventory b/inventory/inventory index 193a4cb65..c5fe315dc 100644 --- a/inventory/inventory +++ b/inventory/inventory @@ -368,7 +368,7 @@ koschei01.phx2.fedoraproject.org koschei01.stg.phx2.fedoraproject.org [infracore] -lockbox01.phx2.fedoraproject.org +batcave01.phx2.fedoraproject.org log01.phx2.fedoraproject.org noc01.phx2.fedoraproject.org noc02.fedoraproject.org @@ -388,8 +388,6 @@ ipsilon01.stg.phx2.fedoraproject.org [dhcp] dhcp01.phx2.fedoraproject.org -[lockbox] - [nagios] noc01.phx2.fedoraproject.org noc02.fedoraproject.org diff --git a/playbooks/manual/push-badges.yml b/playbooks/manual/push-badges.yml index fdc285f94..d6b3ddca3 100644 --- a/playbooks/manual/push-badges.yml +++ b/playbooks/manual/push-badges.yml @@ -7,8 +7,8 @@ # This playbook will take any new content from there and push it out onto our # servers. -- name: get the badges repo happening on lockbox - hosts: lockbox01.phx2.fedoraproject.org +- name: get the badges repo happening from the batcave + hosts: batcave01.phx2.fedoraproject.org user: root gather_facts: False diff --git a/playbooks/manual/staging-sync/lookaside.yml b/playbooks/manual/staging-sync/lookaside.yml index 1a51bdd43..791acb981 100644 --- a/playbooks/manual/staging-sync/lookaside.yml +++ b/playbooks/manual/staging-sync/lookaside.yml @@ -42,7 +42,7 @@ - unarchive: src={{intermediary}}/pkgs02.phx2.fedoraproject.org/{{tarball}} dest=/ - name: finish cleaning up after ourselves - hosts: lockbox01.phx2.fedoraproject.org;pkgs;pkgs-stg + hosts: batcave01.phx2.fedoraproject.org;pkgs;pkgs-stg user: root vars_files: - /srv/web/infra/ansible/vars/global.yml diff --git a/playbooks/transient_cloud_instance.yml b/playbooks/transient_cloud_instance.yml index cffa7cac4..df1e4d79f 100644 --- a/playbooks/transient_cloud_instance.yml +++ b/playbooks/transient_cloud_instance.yml @@ -22,7 +22,7 @@ # - name: check/create instance - hosts: lockbox01.phx2.fedoraproject.org + hosts: batcave01.phx2.fedoraproject.org user: root gather_facts: False diff --git a/roles/base/files/common-scripts/syncFiles.sh b/roles/base/files/common-scripts/syncFiles.sh index ef665b1d8..39a2c53de 100755 --- a/roles/base/files/common-scripts/syncFiles.sh +++ b/roles/base/files/common-scripts/syncFiles.sh @@ -4,7 +4,7 @@ set +e -HOST=lockbox01.vpn.fedoraproject.org +HOST=batcave01 function cleanlock() { diff --git a/roles/nagios_server/files/nagios/hosts/batcave01.cfg b/roles/nagios_server/files/nagios/hosts/batcave01.cfg new file mode 100644 index 000000000..7399fecac --- /dev/null +++ b/roles/nagios_server/files/nagios/hosts/batcave01.cfg @@ -0,0 +1,7 @@ +define host { + host_name batcave01 + alias batcave01.phx2.fedoraproject.org + use defaulttemplate + address batcave01.phx2.fedoraproject.org + parents virthost22 +} diff --git a/roles/nagios_server/files/nagios/hosts/lockbox01.cfg b/roles/nagios_server/files/nagios/hosts/lockbox01.cfg index d84d58edd..6bbfdf626 100644 --- a/roles/nagios_server/files/nagios/hosts/lockbox01.cfg +++ b/roles/nagios_server/files/nagios/hosts/lockbox01.cfg @@ -1,7 +1,7 @@ -define host { - host_name lockbox01 - alias lockbox01.phx2.fedoraproject.org - use defaulttemplate - address lockbox01.phx2.fedoraproject.org - parents virthost15 -} +#define host { +# host_name lockbox01 +# alias lockbox01.phx2.fedoraproject.org +# use defaulttemplate +# address lockbox01.phx2.fedoraproject.org +# parents virthost15 +#} diff --git a/scripts/public-db-copy b/scripts/public-db-copy index 406b60e15..ba2fd0890 100755 --- a/scripts/public-db-copy +++ b/scripts/public-db-copy @@ -1,7 +1,7 @@ #!/bin/bash # -# A simple script to copy database dumps over to public space on lockbox01 +# A simple script to copy database dumps over to public space on batcave01 # Only the most recent dump is published # scp db-datanommer02:/backups/datanommer-$(date +%F).dump.xz /srv/web/infra/db-dumps/datanommer.dump.xz |