diff --git a/playbooks/include/proxies-websites.yml b/playbooks/include/proxies-websites.yml index e37b9e6144..42a3b79f7c 100644 --- a/playbooks/include/proxies-websites.yml +++ b/playbooks/include/proxies-websites.yml @@ -30,7 +30,6 @@ - "85.236.55.6" - "[2001:4178:2:1269::fed2]" - "80.239.156.215" - - "[2610:28:3090:3001:dead:beef:cafe:fed4]" - "140.211.169.197" - "213.175.193.206" - "[2001:2030:0:2::3]" @@ -49,7 +48,7 @@ - "66.35.62.162" - "152.19.134.142" - "80.239.156.215" - - "[2610:28:3090:3001:dead:beef:cafe:fed4]" + - "[2610:28:3090:3001:dead:beef:cafe:fed3]" - "140.211.169.197" - "213.175.193.206" - "[2001:2030:0:2::3]" diff --git a/roles/httpd/proxy/templates/00-namevirtualhost.conf b/roles/httpd/proxy/templates/00-namevirtualhost.conf index 548158dad8..51035aa68b 100644 --- a/roles/httpd/proxy/templates/00-namevirtualhost.conf +++ b/roles/httpd/proxy/templates/00-namevirtualhost.conf @@ -25,8 +25,6 @@ NameVirtualHost 152.19.134.142:80 NameVirtualHost 152.19.134.142:443 NameVirtualHost [2610:28:3090:3001:dead:beef:cafe:fed3]:80 NameVirtualHost [2610:28:3090:3001:dead:beef:cafe:fed3]:443 -NameVirtualHost [2610:28:3090:3001:dead:beef:cafe:fed4]:80 -NameVirtualHost [2610:28:3090:3001:dead:beef:cafe:fed4]:443 #proxy06 NameVirtualHost 140.211.169.196:80 diff --git a/roles/nagios_server/files/nagios-external/hosts/admin.fedoraproject.org.cfg b/roles/nagios_server/files/nagios-external/hosts/admin.fedoraproject.org.cfg index 4d3f27eb42..b773625d5b 100644 --- a/roles/nagios_server/files/nagios-external/hosts/admin.fedoraproject.org.cfg +++ b/roles/nagios_server/files/nagios-external/hosts/admin.fedoraproject.org.cfg @@ -74,13 +74,13 @@ define host { # ibiblio ipv6 # -define host { - host_name admin-ipv6-ibiblio - alias 2610:28:3090:3001:dead:beef:cafe:fed4-ibiblio - use defaulttemplate - address 2610:28:3090:3001:dead:beef:cafe:fed4 - parents proxy04-ipv6-ibiblio.fedoraproject.org -} +#define host { +# host_name admin-ipv6-ibiblio +# alias 2610:28:3090:3001:dead:beef:cafe:fed3-ibiblio +# use defaulttemplate +# address 2610:28:3090:3001:dead:beef:cafe:fed3 +# parents proxy04-ipv6-ibiblio.fedoraproject.org +#} define host { host_name proxy04-ipv6-ibiblio.fedoraproject.org diff --git a/roles/nagios_server/files/nagios-external/hosts/fedoraproject.org.cfg b/roles/nagios_server/files/nagios-external/hosts/fedoraproject.org.cfg index 666119fdd2..dee03458b8 100644 --- a/roles/nagios_server/files/nagios-external/hosts/fedoraproject.org.cfg +++ b/roles/nagios_server/files/nagios-external/hosts/fedoraproject.org.cfg @@ -30,13 +30,13 @@ define host { parents proxy04.fedoraproject.org } -define host { - host_name fpo-ipv6-ibiblio - alias fpo-ipv6-ibiblio - use defaulttemplate - address 2610:28:3090:3001:dead:beef:cafe:fed4 - parents proxy04-ipv6-ibiblio.fedoraproject.org -} +#define host { +# host_name fpo-ipv6-ibiblio +# alias fpo-ipv6-ibiblio +# use defaulttemplate +# address 2610:28:3090:3001:dead:beef:cafe:fed4 +# parents proxy04-ipv6-ibiblio.fedoraproject.org +#} #define host { # host_name 140.211.169.197-osuosl