From b9180755f402b65ae7056a4f38ca080ab5d7a3a3 Mon Sep 17 00:00:00 2001 From: Ralph Bean Date: Tue, 6 Jan 2015 20:22:56 +0000 Subject: [PATCH] Collapse old references to .89 over to .88. --- roles/hosts/files/buildvm-01.stg.phx2.fedoraproject.org-hosts | 3 +-- roles/hosts/files/koji01.stg.phx2.fedoraproject.org-hosts | 3 +-- roles/hosts/files/staging-hosts | 3 +-- roles/httpd/proxy/templates/00-namevirtualhost.conf | 2 -- 4 files changed, 3 insertions(+), 8 deletions(-) diff --git a/roles/hosts/files/buildvm-01.stg.phx2.fedoraproject.org-hosts b/roles/hosts/files/buildvm-01.stg.phx2.fedoraproject.org-hosts index 0edbae4de0..b901c8c7e7 100644 --- a/roles/hosts/files/buildvm-01.stg.phx2.fedoraproject.org-hosts +++ b/roles/hosts/files/buildvm-01.stg.phx2.fedoraproject.org-hosts @@ -4,8 +4,7 @@ # Use admin.fedoraproject.org so we can get a fresh CRL from prod - it isn't # synced to staging in a meaningful way. See /usr/local/bin/updatecrl.sh 209.132.181.16 admin.fedoraproject.org -10.5.126.89 admin.stg.fedoraproject.org -10.5.126.88 proxy01.phx2.fedoraproject.org proxy1 proxy2 proxy3 proxy4 proxy01 proxy02 proxy03 proxy04 fedoraproject.org +10.5.126.88 proxy01.phx2.fedoraproject.org proxy1 proxy2 proxy3 proxy4 proxy01 proxy02 proxy03 proxy04 fedoraproject.org admin.stg.fedoraproject.org 10.5.126.23 infrastructure.fedoraproject.org 10.5.126.81 app01.stg.fedoraproject.org memcached01 memcached02 memcached03 memcached04 10.5.126.85 db02.stg.fedoraproject.org db01 db-koji01 db05 db-ask db-datanommer db-datanommer01 db-datanommer02 db-datanommer02.phx2.fedoraproject.org db-tahrir db-elections db-fedocal db-github2fedmsg db-kerneltest db-notifs nuancier_db db-pkgdb2 db-summershum tagger_db diff --git a/roles/hosts/files/koji01.stg.phx2.fedoraproject.org-hosts b/roles/hosts/files/koji01.stg.phx2.fedoraproject.org-hosts index 0edbae4de0..b901c8c7e7 100644 --- a/roles/hosts/files/koji01.stg.phx2.fedoraproject.org-hosts +++ b/roles/hosts/files/koji01.stg.phx2.fedoraproject.org-hosts @@ -4,8 +4,7 @@ # Use admin.fedoraproject.org so we can get a fresh CRL from prod - it isn't # synced to staging in a meaningful way. See /usr/local/bin/updatecrl.sh 209.132.181.16 admin.fedoraproject.org -10.5.126.89 admin.stg.fedoraproject.org -10.5.126.88 proxy01.phx2.fedoraproject.org proxy1 proxy2 proxy3 proxy4 proxy01 proxy02 proxy03 proxy04 fedoraproject.org +10.5.126.88 proxy01.phx2.fedoraproject.org proxy1 proxy2 proxy3 proxy4 proxy01 proxy02 proxy03 proxy04 fedoraproject.org admin.stg.fedoraproject.org 10.5.126.23 infrastructure.fedoraproject.org 10.5.126.81 app01.stg.fedoraproject.org memcached01 memcached02 memcached03 memcached04 10.5.126.85 db02.stg.fedoraproject.org db01 db-koji01 db05 db-ask db-datanommer db-datanommer01 db-datanommer02 db-datanommer02.phx2.fedoraproject.org db-tahrir db-elections db-fedocal db-github2fedmsg db-kerneltest db-notifs nuancier_db db-pkgdb2 db-summershum tagger_db diff --git a/roles/hosts/files/staging-hosts b/roles/hosts/files/staging-hosts index 474ca5a2d0..6935ae4d2b 100644 --- a/roles/hosts/files/staging-hosts +++ b/roles/hosts/files/staging-hosts @@ -1,8 +1,7 @@ 127.0.0.1 localhost localhost.localdomain localhost4 localhost4.localdomain4 ::1 localhost localhost.localdomain localhost6 localhost6.localdomain6 -10.5.126.89 admin.fedoraproject.org admin.stg.fedoraproject.org -10.5.126.88 proxy01.phx2.fedoraproject.org proxy1 proxy2 proxy3 proxy4 proxy01 proxy02 proxy03 proxy04 fedoraproject.org +10.5.126.88 proxy01.phx2.fedoraproject.org proxy1 proxy2 proxy3 proxy4 proxy01 proxy02 proxy03 proxy04 fedoraproject.org admin.fedoraproject.org admin.stg.fedoraproject.org 10.5.126.23 infrastructure.fedoraproject.org 10.5.126.81 app01.stg.fedoraproject.org memcached01 memcached02 memcached03 memcached04 10.5.126.85 db02.stg.fedoraproject.org db01 db-koji01 db05 db-ask db-datanommer db-datanommer01 db-datanommer02 db-datanommer02.phx2.fedoraproject.org db-tahrir db-elections db-fedocal db-github2fedmsg db-kerneltest db-notifs nuancier_db db-pkgdb2 db-summershum tagger_db diff --git a/roles/httpd/proxy/templates/00-namevirtualhost.conf b/roles/httpd/proxy/templates/00-namevirtualhost.conf index ae44cb6cee..399fa003cc 100644 --- a/roles/httpd/proxy/templates/00-namevirtualhost.conf +++ b/roles/httpd/proxy/templates/00-namevirtualhost.conf @@ -58,5 +58,3 @@ NameVirtualHost 192.168.122.2:443 #proxy01.stg NameVirtualHost 10.5.126.88:80 NameVirtualHost 10.5.126.88:443 -NameVirtualHost 10.5.126.89:80 -NameVirtualHost 10.5.126.89:443