projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove old klecker IP addresses
[mirror/dsa-puppet.git]
/
modules
/
roles
/
manifests
/
debian_mirror.pp
diff --git
a/modules/roles/manifests/debian_mirror.pp
b/modules/roles/manifests/debian_mirror.pp
index
2e22aaa
..
46eb1ac
100644
(file)
--- a/
modules/roles/manifests/debian_mirror.pp
+++ b/
modules/roles/manifests/debian_mirror.pp
@@
-14,23
+14,15
@@
class roles::debian_mirror {
true => '193.31.7.2:80 [2a02:158:ffff:deb::2]:80',
default => '',
}], ' ')
true => '193.31.7.2:80 [2a02:158:ffff:deb::2]:80',
default => '',
}], ' ')
- $onion_v4_addr = $::hostname ? {
- mirror-bytemark => '5.153.231.45',
- klecker => '130.89.148.12',
- mirror-isc => '149.20.4.15',
- default => undef,
- }
apache2::site { '010-ftp.debian.org':
site => 'ftp.debian.org',
content => template('roles/apache-ftp.debian.org.erb'),
}
apache2::site { '010-ftp.debian.org':
site => 'ftp.debian.org',
content => template('roles/apache-ftp.debian.org.erb'),
}
- if has_role('debian_mirror_onion') {
- if ! $onion_v4_addr {
- fail("Do not have an onion_v4_addr set for $::hostname.")
- }
-
+ $onion_v4_addr = hiera("roles.debian_mirror", {})
+ .dig($::fqdn, 'onion_v4_address')
+ if $onion_v4_addr {
onion::service { 'ftp.debian.org':
port => 80,
target_port => 80,
onion::service { 'ftp.debian.org':
port => 80,
target_port => 80,
@@
-38,9
+30,9
@@
class roles::debian_mirror {
}
}
}
}
- $
mirrors
= hiera('roles.debian_mirror', {})
-
$fastly_mirrors = $mirrors
.filter |$h| { $h[1]['fastly-backend'] }
-
$hosts_to_check = $fastly_mirrors
.map |$h| { $h[1]['service-hostname'] }
+ $
hosts_to_check
= hiera('roles.debian_mirror', {})
+
.filter |$h| { $h[1]['fastly-backend'] }
+
.map |$h| { $h[1]['service-hostname'] }
roles::mirror_health { 'ftp':
check_hosts => $hosts_to_check,
roles::mirror_health { 'ftp':
check_hosts => $hosts_to_check,