diff --git a/inventory/host_vars/download-ib01.fedoraproject.org b/inventory/host_vars/download-ib01.fedoraproject.org index e72981d518..05996695b5 100644 --- a/inventory/host_vars/download-ib01.fedoraproject.org +++ b/inventory/host_vars/download-ib01.fedoraproject.org @@ -12,8 +12,9 @@ volgroup: /dev/vg_guests eth0_ip: 152.19.134.145 eth0_nm: 255.255.255.128 has_ipv6: yes -eth0_ipv6: "2610:28:3090:3001:dead:beef:cafe:fed6" -eth0_ipv6_gw: "2610:28:3090:3001::1" +eth0_ipv6: "2600:2701:4000:5211:dead:beef:00fe:fed6" +eth0_ipv6_nm: 104 +eth0_ipv6_gw: "2600:2701:4000:5211::1" datacenter: ibiblio postfix_group: vpn diff --git a/inventory/host_vars/noc02.fedoraproject.org b/inventory/host_vars/noc02.fedoraproject.org index 0911867f62..3dfa47409d 100644 --- a/inventory/host_vars/noc02.fedoraproject.org +++ b/inventory/host_vars/noc02.fedoraproject.org @@ -8,8 +8,9 @@ volgroup: /dev/vg_guests eth0_ip: 152.19.134.192 eth0_nm: 255.255.255.128 has_ipv6: yes -eth0_ipv6: "2610:28:3090:3001:dead:beef:cafe:fed9" -eth0_ipv6_gw: "2610:28:3090:3001::1" +eth0_ipv6: "2600:2701:4000:5211:dead:beef:00fe:fed9" +eth0_ipv6_nm: 104 +eth0_ipv6_gw: "2600:2701:4000:5211::1" postfix_maincf: "postfix/main.cf/main.cf.noc02.fedoraproject.org" postfix_mastercf: "postfix/master.cf/master.cf.noc02.fedoraproject.org" postfix_transport_filename: transports.noc02.fedoraproject.org diff --git a/inventory/host_vars/ns02.fedoraproject.org b/inventory/host_vars/ns02.fedoraproject.org index b6be548478..7d5c13eb5e 100644 --- a/inventory/host_vars/ns02.fedoraproject.org +++ b/inventory/host_vars/ns02.fedoraproject.org @@ -8,8 +8,9 @@ volgroup: /dev/vg_guests eth0_ip: 152.19.134.139 eth0_nm: 255.255.255.128 has_ipv6: yes -eth0_ipv6: "2610:28:3090:3001:dead:beef:cafe:fed5" -eth0_ipv6_gw: "2610:28:3090:3001::1" +eth0_ipv6: "2600:2701:4000:5211:dead:beef:00fe:fed7" +eth0_ipv6_nm: 104 +eth0_ipv6_gw: "2600:2701:4000:5211::1" postfix_group: vpn vpn: true diff --git a/inventory/host_vars/people02.fedoraproject.org b/inventory/host_vars/people02.fedoraproject.org index 19abd90f6f..fb331068bb 100644 --- a/inventory/host_vars/people02.fedoraproject.org +++ b/inventory/host_vars/people02.fedoraproject.org @@ -9,8 +9,9 @@ volgroup: /dev/vg_guests eth0_ip: 152.19.134.199 eth0_nm: 255.255.255.128 has_ipv6: yes -eth0_ipv6: "2610:28:3090:3001:5054:ff:fea7:9474" -eth0_ipv6_gw: "2610:28:3090:3001::1" +eth0_ipv6: "2600:2701:4000:5211:dead:beef:00a7:9474" +eth0_ipv6_nm: 104 +eth0_ipv6_gw: "2600:2701:4000:5211::1" ks_url: http://209.132.181.6/repo/rhel/ks/kvm-rhel-7-people ks_repo: http://209.132.181.6/repo/rhel/RHEL7-x86_64/ diff --git a/inventory/host_vars/proxy04.fedoraproject.org b/inventory/host_vars/proxy04.fedoraproject.org index 9799431feb..34d4520e11 100644 --- a/inventory/host_vars/proxy04.fedoraproject.org +++ b/inventory/host_vars/proxy04.fedoraproject.org @@ -28,9 +28,9 @@ eth0_ipv4_nm: 25 eth0_ipv4_gw: 152.19.134.129 has_ipv6: yes -eth0_ipv6: "2610:28:3090:3001:dead:beef:cafe:fed3" -eth0_ipv6_nm: 64 -eth0_ipv6_gw: "2610:28:3090:3001::1" +eth0_ipv6: "2600:2701:4000:5211:dead:beef:00fe:fed3" +eth0_ipv6_nm: 104 +eth0_ipv6_gw: "2600:2701:4000:5211::1" mac0: "52:54:00:e3:bb:8f" public_hostname: proxy04.fedoraproject.org diff --git a/inventory/host_vars/proxy12.fedoraproject.org b/inventory/host_vars/proxy12.fedoraproject.org index 428bb1c77b..7c438aa4ef 100644 --- a/inventory/host_vars/proxy12.fedoraproject.org +++ b/inventory/host_vars/proxy12.fedoraproject.org @@ -28,9 +28,9 @@ eth0_ipv4_nm: 25 eth0_ipv4_gw: 152.19.134.129 has_ipv6: yes -eth0_ipv6: "2610:28:3090:3001:5054:ff:feda:bbd8" -eth0_ipv6_nm: 64 -eth0_ipv6_gw: "2610:28:3090:3001::1" +eth0_ipv6: "2600:2701:4000:5211:dead:beef:00da:bbd8" +eth0_ipv6_nm: 104 +eth0_ipv6_gw: "2600:2701:4000:5211::1" mac0: "52:54:00:84:5d:9f" public_hostname: proxy12.fedoraproject.org diff --git a/inventory/host_vars/smtp-mm-ib01.fedoraproject.org b/inventory/host_vars/smtp-mm-ib01.fedoraproject.org index 145a9ab6ef..baef020d71 100644 --- a/inventory/host_vars/smtp-mm-ib01.fedoraproject.org +++ b/inventory/host_vars/smtp-mm-ib01.fedoraproject.org @@ -6,8 +6,9 @@ volgroup: /dev/vg_guests eth0_ip: 152.19.134.143 eth0_nm: 255.255.255.128 has_ipv6: yes -eth0_ipv6: "2610:28:3090:3001:5054:ff:fe58:5c17" -eth0_ipv6_gw: "2610:28:3090:3001::1" +eth0_ipv6: "2600:2701:4000:5211:dead:beef:0058:5c17" +eth0_ipv6_nm: 104 +eth0_ipv6_gw: "2600:2701:4000:5211::1" vmhost: ibiblio05.fedoraproject.org datacenter: ibiblio diff --git a/inventory/host_vars/torrent02.fedoraproject.org b/inventory/host_vars/torrent02.fedoraproject.org index 9f127cc459..ed25bc32e0 100644 --- a/inventory/host_vars/torrent02.fedoraproject.org +++ b/inventory/host_vars/torrent02.fedoraproject.org @@ -8,8 +8,9 @@ volgroup: /dev/vg_guests eth0_ip: 152.19.134.148 eth0_nm: 255.255.255.128 has_ipv6: yes -eth0_ipv6: "2610:28:3090:3001:dead:beef:cafe:fed7" -eth0_ipv6_gw: "2610:28:3090:3001::1" +eth0_ipv6: "2600:2701:4000:5211:dead:beef:00fe:fed7" +eth0_ipv6_nm: 104 +eth0_ipv6_gw: "2600:2701:4000:5211::1" ks_url: http://209.132.181.6/repo/rhel/ks/kvm-rhel-7-ext ks_repo: http://209.132.181.6/repo/rhel/RHEL7-x86_64/ diff --git a/inventory/host_vars/unbound-ib01.fedoraproject.org b/inventory/host_vars/unbound-ib01.fedoraproject.org index 4001f4fb0c..4c911e84e9 100644 --- a/inventory/host_vars/unbound-ib01.fedoraproject.org +++ b/inventory/host_vars/unbound-ib01.fedoraproject.org @@ -7,6 +7,10 @@ ks_repo: http://infrastructure.fedoraproject.org/repo/rhel/RHEL7-x86_64/ volgroup: /dev/vg_guests eth0_ip: 152.19.134.150 eth0_nm: 255.255.255.128 +has_ipv6: yes +eth0_ipv6: "2600:2701:4000:5211:dead:beef:00fe:fed1" +eth0_ipv6_nm: 104 +eth0_ipv6_gw: "2600:2701:4000:5211::1" vmhost: ibiblio05.fedoraproject.org datacenter: ibiblio postfix_group: vpn diff --git a/roles/base/templates/iptables/ip6tables b/roles/base/templates/iptables/ip6tables index 921435cd0a..a1b9e3053c 100644 --- a/roles/base/templates/iptables/ip6tables +++ b/roles/base/templates/iptables/ip6tables @@ -28,7 +28,7 @@ -A INPUT -m conntrack --ctstate NEW -m tcp -p tcp --dport 22 -j ACCEPT # for nrpe (if we want noc02 to be able to get into remote systems) -#-A INPUT -p tcp -m tcp --dport 5666 -s 2610:28:3090:3001:dead:beef:cafe:fed9 -j ACCEPT +#-A INPUT -p tcp -m tcp --dport 5666 -s 2600:2701:4000:5211:dead:beef:00fe:fed9 -j ACCEPT # if the host/group defines incoming tcp_ports - allow them {% if tcp_ports is defined %} diff --git a/roles/mediawiki/templates/LocalSettings.php.fp.j2 b/roles/mediawiki/templates/LocalSettings.php.fp.j2 index 50aa7e1616..1f3d260bee 100644 --- a/roles/mediawiki/templates/LocalSettings.php.fp.j2 +++ b/roles/mediawiki/templates/LocalSettings.php.fp.j2 @@ -356,7 +356,7 @@ $wgSquidServersNoPurge = array( # proxy04 "152.19.134.142", - "2610:28:3090:3001:dead:beef:cafe:fed3", + "2600:2701:4000:5211:dead:beef:00fe:fed3", "192.168.1.14", # proxy05 diff --git a/roles/nagios_server/templates/httpd/nagios.conf.j2 b/roles/nagios_server/templates/httpd/nagios.conf.j2 index 610fe915d8..a69922c3e9 100644 --- a/roles/nagios_server/templates/httpd/nagios.conf.j2 +++ b/roles/nagios_server/templates/httpd/nagios.conf.j2 @@ -40,7 +40,7 @@ Alias /robots.txt /var/www/robots.txt SetHandler server-status {% if vars['nagios_location'] == 'external' %} - Require ip 2610:28:3090:3001:dead:beef:cafe:fed9 + Require ip 2600:2701:4000:5211:dead:beef:00fe:fed9 {% else %} Require ip 10.3.163.10 {% endif %} diff --git a/roles/torrent/files/opentracker-ipv6.conf b/roles/torrent/files/opentracker-ipv6.conf index 8008e50e81..ca523d9029 100644 --- a/roles/torrent/files/opentracker-ipv6.conf +++ b/roles/torrent/files/opentracker-ipv6.conf @@ -7,7 +7,7 @@ # If no listen option is given (here or on the command line), opentracker # listens on 0.0.0.0:6969 tcp and udp. # -listen.tcp_udp [2610:28:3090:3001:dead:beef:cafe:fed7]:6969 +listen.tcp_udp [2600:2701:4000:5211:dead:beef:00fe:fed7]:6969 # listen.tcp_udp 192.168.0.1:80 # listen.tcp_udp 10.0.0.5:6969 #