From 5e199891f346b162798dc59c128a08d1ad0d7fbf Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Fri, 6 Jan 2017 10:18:19 +0100 Subject: [PATCH] mirror-isc renumber --- modules/roles/manifests/debug_mirror.pp | 4 ++-- modules/roles/manifests/ports_mirror.pp | 4 ++-- modules/roles/manifests/security_mirror.pp | 6 +++--- modules/roles/manifests/static_mirror.pp | 6 +++--- modules/roles/manifests/syncproxy.pp | 4 ++-- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/modules/roles/manifests/debug_mirror.pp b/modules/roles/manifests/debug_mirror.pp index 94c73a577..abe9fd131 100644 --- a/modules/roles/manifests/debug_mirror.pp +++ b/modules/roles/manifests/debug_mirror.pp @@ -1,12 +1,12 @@ class roles::debug_mirror { $vhost_listen = $::hostname ? { klecker => '130.89.148.14:80 [2001:610:1908:b000::148:14]:80', - mirror-isc => '149.20.20.22:80 [2001:4f8:8:36::1deb:22]:80', + mirror-isc => '149.20.4.15:80 [2001:4f8:1:c::15]:80', default => '*:80', } $onion_v4_addr = $::hostname ? { klecker => '130.89.148.14', - mirror-isc => '149.20.20.22', + mirror-isc => '149.20.4.15', default => undef, } diff --git a/modules/roles/manifests/ports_mirror.pp b/modules/roles/manifests/ports_mirror.pp index 31cf1b568..0152dad4a 100644 --- a/modules/roles/manifests/ports_mirror.pp +++ b/modules/roles/manifests/ports_mirror.pp @@ -1,12 +1,12 @@ class roles::ports_mirror { $vhost_listen = $::hostname ? { klecker => '130.89.148.14:80 [2001:610:1908:b000::148:14]:80', - mirror-isc => '149.20.20.22:80 [2001:4f8:8:36::1deb:22]:80', + mirror-isc => '149.20.4.15:80 [2001:4f8:1:c::15]:80', default => '*:80', } $onion_v4_addr = $::hostname ? { klecker => '130.89.148.14', - mirror-isc => '149.20.20.22', + mirror-isc => '149.20.4.15', default => undef, } diff --git a/modules/roles/manifests/security_mirror.pp b/modules/roles/manifests/security_mirror.pp index 048236266..04a0d7fad 100644 --- a/modules/roles/manifests/security_mirror.pp +++ b/modules/roles/manifests/security_mirror.pp @@ -1,13 +1,13 @@ class roles::security_mirror { $rsync_bind = $::hostname ? { mirror-anu => '150.203.164.61', - mirror-isc => '149.20.20.19', + mirror-isc => '149.20.4.14', mirror-umn => '128.101.240.215', default => '', } $rsync_bind6 = $::hostname ? { mirror-anu => '2001:388:1034:2900::3d', - mirror-isc => '2001:4f8:8:36::1deb:19', + mirror-isc => '2001:4f8:1:c::14', mirror-umn => '2607:ea00:101:3c0b::1deb:215', default => '', } @@ -54,7 +54,7 @@ class roles::security_mirror { $onion_v4_addr = $::hostname ? { mirror-anu => '150.203.164.61', - mirror-isc => '149.20.20.19', + mirror-isc => '149.20.4.14', mirror-umn => '128.101.240.215', villa => '212.211.132.32', lobos => '212.211.132.250', diff --git a/modules/roles/manifests/static_mirror.pp b/modules/roles/manifests/static_mirror.pp index de46c650a..df77c33e3 100644 --- a/modules/roles/manifests/static_mirror.pp +++ b/modules/roles/manifests/static_mirror.pp @@ -34,19 +34,19 @@ class roles::static_mirror { $onion_v4_addr = $::hostname ? { busoni => '140.211.15.34', klecker => '130.89.148.14', - mirror-isc => '149.20.20.22', + mirror-isc => '149.20.4.15', senfter => '5.153.231.4', default => undef, } $vhost_listen = $::hostname ? { klecker => '130.89.148.14:80 [2001:610:1908:b000::148:14]:80', - mirror-isc => '149.20.20.22:80 [2001:4f8:8:36::1deb:22]:80', + mirror-isc => '149.20.4.15:80 [2001:4f8:1:c::15]:80', mirror-anu => '150.203.164.62:80 [2001:388:1034:2900::3e]:80', default => '*:80', } $vhost_listen_443 = $::hostname ? { klecker => '130.89.148.14:443 [2001:610:1908:b000::148:14]:443', - mirror-isc => '149.20.20.22:443 [2001:4f8:8:36::1deb:22]:443', + mirror-isc => '149.20.4.15:443 [2001:4f8:1:c::15]:443', mirror-anu => '150.203.164.62:443 [2001:388:1034:2900::3e]:443', default => '*:443', } diff --git a/modules/roles/manifests/syncproxy.pp b/modules/roles/manifests/syncproxy.pp index 3101025d1..5aa4fde95 100644 --- a/modules/roles/manifests/syncproxy.pp +++ b/modules/roles/manifests/syncproxy.pp @@ -2,7 +2,7 @@ class roles::syncproxy { $bind = $::hostname ? { 'milanollo' => '5.153.231.9', 'mirror-anu' => '150.203.164.60', - 'mirror-isc' => '149.20.20.21', + 'mirror-isc' => '149.20.4.16', 'mirror-umn' => '128.101.240.216', 'klecker' => '130.89.148.10', default => '' @@ -10,7 +10,7 @@ class roles::syncproxy { $bind6 = $::hostname ? { 'milanollo' => '2001:41c8:1000:21::21:9', 'mirror-anu' => '2001:388:1034:2900::3c', - 'mirror-isc' => '2001:4f8:8:36::1deb:21', + 'mirror-isc' => '2001:4f8:1:c::16', 'mirror-umn' => '2607:ea00:101:3c0b::1deb:216', 'klecker' => '2001:610:1908:b000::148:10', default => '' -- 2.20.1