summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--inventory/group_vars/mirrorlist22
-rw-r--r--roles/httpd/proxy/templates/00-namevirtualhost.conf4
-rw-r--r--roles/mediawiki/templates/LocalSettings.php.fp.j22
-rw-r--r--roles/nagios_server/files/nagios-external/hosts/admin.fedoraproject.org.cfg4
-rw-r--r--roles/nagios_server/files/nagios-external/hosts/fedoraproject.org.cfg2
5 files changed, 7 insertions, 7 deletions
diff --git a/inventory/group_vars/mirrorlist2 b/inventory/group_vars/mirrorlist2
index 8b5854536..42138a399 100644
--- a/inventory/group_vars/mirrorlist2
+++ b/inventory/group_vars/mirrorlist2
@@ -15,7 +15,7 @@ custom_rules: [ '-A INPUT -p tcp -m tcp -s 192.168.0.0/16 --dport 80 -j ACCEPT',
'-A INPUT -p tcp -m tcp -s 140.211.169.196/32 --dport 443 -j ACCEPT', ]
custom6_rules: [ '-A INPUT -p tcp -m tcp -s 2610:28:3090:3001:dead:beef:cafe:fed3 --dport 443 -j ACCEPT',
- '-A INPUT -p tcp -m tcp -s 2604:1580:fe00:0:5054:ff:feae:702c --dport 443 -j ACCEPT',
+ '-A INPUT -p tcp -m tcp -s 2604:1580:fe00:0:dead:beef:cafe:fed1 --dport 443 -j ACCEPT',
'-A INPUT -p tcp -m tcp -s 2a00:d1a0:1::131 --dport 443 -j ACCEPT', ]
collectd_apache: true
diff --git a/roles/httpd/proxy/templates/00-namevirtualhost.conf b/roles/httpd/proxy/templates/00-namevirtualhost.conf
index 8dc330f52..9e8cce449 100644
--- a/roles/httpd/proxy/templates/00-namevirtualhost.conf
+++ b/roles/httpd/proxy/templates/00-namevirtualhost.conf
@@ -54,8 +54,8 @@ NameVirtualHost 10.5.126.51:443
# proxy11
NameVirtualHost 67.219.144.68:80
NameVirtualHost 67.219.144.68:443
-NameVirtualHost [2604:1580:fe00:0:5054:ff:feae:702c]:80
-NameVirtualHost [2604:1580:fe00:0:5054:ff:feae:702c]:443
+NameVirtualHost [2604:1580:fe00:0:dead:beef:cafe:fed1]:80
+NameVirtualHost [2604:1580:fe00:0:dead:beef:cafe:fed1]:443
#proxy01.stg
NameVirtualHost 10.5.126.88:80
diff --git a/roles/mediawiki/templates/LocalSettings.php.fp.j2 b/roles/mediawiki/templates/LocalSettings.php.fp.j2
index 5ee01d257..e0266aa53 100644
--- a/roles/mediawiki/templates/LocalSettings.php.fp.j2
+++ b/roles/mediawiki/templates/LocalSettings.php.fp.j2
@@ -376,7 +376,7 @@ $wgSquidServersNoPurge = array(
# proxy11
"67.219.144.68",
- "2604:1580:fe00:0:5054:ff:feae:702c",
+ "2604:1580:fe00:0:dead:beef:cafe:fed1",
"192.168.1.37",
{% endif %}
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 7d21993c4..237c94810 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
@@ -252,7 +252,7 @@ define host {
host_name admin-ipv6-dedicated
alias admin-ipv6-dedicated
use defaulttemplate
- address 2604:1580:fe00:0:5054:ff:feae:702c
+ address 2604:1580:fe00:0:dead:beef:cafe:fed1
parents proxy11-ipv6.fedoraproject.org
}
@@ -260,7 +260,7 @@ define host {
host_name proxy11-ipv6.fedoraproject.org
alias proxy11-ipv6.fedoraproject.org
use defaulttemplate
- address 2604:1580:fe00:0:5054:ff:feae:702c
+ address 2604:1580:fe00:0:dead:beef:cafe:fed1
}
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 afcd83037..f7f1a3a39 100644
--- a/roles/nagios_server/files/nagios-external/hosts/fedoraproject.org.cfg
+++ b/roles/nagios_server/files/nagios-external/hosts/fedoraproject.org.cfg
@@ -82,6 +82,6 @@ define host {
host_name fpo-ipv6-dedicatedsolutions
alias fpo-ipv6-dedicatedsolutions
use defaulttemplate
- address 2604:1580:fe00:0:5054:ff:feae:702c
+ address 2604:1580:fe00:0:dead:beef:cafe:fed1
parents proxy11-ipv6.fedoraproject.org
}