From 0a87de6e213f01677c03a7f64a87ee4e781a2293 Mon Sep 17 00:00:00 2001
From: Stephen Smoogen <smooge@redhat.com>
Date: Tue, 24 Sep 2019 21:55:32 +0000
Subject: [PATCH] [proxies] remove proxy08 from ansible configs

---
 inventory/inventory                                 |  4 ++--
 roles/base/files/syncHttpLogs.sh                    |  2 +-
 roles/httpd/proxy/templates/00-namevirtualhost.conf | 12 ++++++------
 roles/mediawiki/templates/LocalSettings.php.fp.j2   | 13 -------------
 .../mediawiki123/templates/LocalSettings.php.fp.j2  | 11 -----------
 5 files changed, 9 insertions(+), 33 deletions(-)

diff --git a/inventory/inventory b/inventory/inventory
index 9b730b9744..b10d71d92b 100644
--- a/inventory/inventory
+++ b/inventory/inventory
@@ -474,7 +474,7 @@ proxy04.fedoraproject.org
 proxy05.fedoraproject.org
 proxy06.fedoraproject.org
 #proxy07.fedoraproject.org
-proxy08.fedoraproject.org
+#proxy08.fedoraproject.org
 proxy09.fedoraproject.org
 proxy10.phx2.fedoraproject.org
 proxy11.fedoraproject.org
@@ -643,7 +643,7 @@ proxy04.fedoraproject.org
 proxy05.fedoraproject.org
 proxy06.fedoraproject.org
 #proxy07.fedoraproject.org
-proxy08.fedoraproject.org
+#proxy08.fedoraproject.org
 proxy09.fedoraproject.org
 proxy10.phx2.fedoraproject.org
 proxy11.fedoraproject.org
diff --git a/roles/base/files/syncHttpLogs.sh b/roles/base/files/syncHttpLogs.sh
index 7157704372..35c7e7bdbc 100644
--- a/roles/base/files/syncHttpLogs.sh
+++ b/roles/base/files/syncHttpLogs.sh
@@ -34,7 +34,7 @@ syncHttpLogs proxy03.vpn.fedoraproject.org
 syncHttpLogs proxy04.vpn.fedoraproject.org
 syncHttpLogs proxy05.vpn.fedoraproject.org
 syncHttpLogs proxy06.vpn.fedoraproject.org
-syncHttpLogs proxy08.vpn.fedoraproject.org
+#syncHttpLogs proxy08.vpn.fedoraproject.org
 syncHttpLogs proxy09.vpn.fedoraproject.org
 syncHttpLogs proxy10.phx2.fedoraproject.org
 syncHttpLogs proxy11.vpn.fedoraproject.org
diff --git a/roles/httpd/proxy/templates/00-namevirtualhost.conf b/roles/httpd/proxy/templates/00-namevirtualhost.conf
index 1914108f78..1e30856d2e 100644
--- a/roles/httpd/proxy/templates/00-namevirtualhost.conf
+++ b/roles/httpd/proxy/templates/00-namevirtualhost.conf
@@ -33,14 +33,14 @@ NameVirtualHost 140.211.169.196:80
 NameVirtualHost 140.211.169.196:443
 
 #proxy07
-NameVirtualHost 174.141.234.172:80
-NameVirtualHost 174.141.234.172:443
+#NameVirtualHost 174.141.234.172:80
+#NameVirtualHost 174.141.234.172:443
 
 #proxy08
-NameVirtualHost 67.203.2.67:80
-NameVirtualHost 67.203.2.67:443
-NameVirtualHost [2607:f188::dead:beef:cafe:fed1]:80
-NameVirtualHost [2607:f188::dead:beef:cafe:fed1]:443
+#NameVirtualHost 67.203.2.67:80
+#NameVirtualHost 67.203.2.67:443
+#NameVirtualHost [2607:f188::dead:beef:cafe:fed1]:80
+#NameVirtualHost [2607:f188::dead:beef:cafe:fed1]:443
 
 #proxy09
 NameVirtualHost 140.211.169.206:80
diff --git a/roles/mediawiki/templates/LocalSettings.php.fp.j2 b/roles/mediawiki/templates/LocalSettings.php.fp.j2
index 1d30cac280..ad39df9636 100644
--- a/roles/mediawiki/templates/LocalSettings.php.fp.j2
+++ b/roles/mediawiki/templates/LocalSettings.php.fp.j2
@@ -356,15 +356,6 @@ $wgSquidServersNoPurge = array(
     "140.211.169.196",
     "192.168.1.63",
 
-    # proxy07
-#    "174.141.234.172",
-#    "192.168.1.52",
-
-    # proxy08
-    "67.203.2.67",
-    "2607:f188::dead:beef:cafe:fed1",
-    "192.168.1.78",
-
     # proxy09
     "140.211.169.206",
     "192.168.1.15",
@@ -410,10 +401,6 @@ $wgSquidServers = array(
     "192.168.1.25:6081",
     # proxy06
     "192.168.1.63:6081",
-    # proxy07
-#    "192.168.1.52:6081",
-    # proxy08
-    "192.168.1.78:6081",
     # proxy10
     "10.5.126.51:6081",
     # proxy11
diff --git a/roles/mediawiki123/templates/LocalSettings.php.fp.j2 b/roles/mediawiki123/templates/LocalSettings.php.fp.j2
index e0f49c2a1a..0bb1f219ac 100644
--- a/roles/mediawiki123/templates/LocalSettings.php.fp.j2
+++ b/roles/mediawiki123/templates/LocalSettings.php.fp.j2
@@ -357,15 +357,6 @@ $wgSquidServersNoPurge = array(
     "140.211.169.196",
     "192.168.1.63",
 
-    # proxy07
-    "174.141.234.172",
-    "192.168.1.52",
-
-    # proxy08
-    "67.203.2.67",
-    "2607:f188::dead:beef:cafe:fed1",
-    "192.168.1.78",
-
     # proxy09
     "140.211.169.206",
     "192.168.1.15",
@@ -411,8 +402,6 @@ $wgSquidServers = array(
     "192.168.1.25:6081",
     # proxy06
     "192.168.1.63:6081",
-    # proxy08
-    "192.168.1.78:6081",
     # proxy10
     "10.5.126.51:6081",
     # proxy11