projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
security upload host: /etc/ssh/userkeys/dak should exist
[mirror/dsa-puppet.git]
/
modules
/
roles
/
manifests
/
debug_mirror.pp
diff --git
a/modules/roles/manifests/debug_mirror.pp
b/modules/roles/manifests/debug_mirror.pp
index
c2ec74a
..
c178b1e
100644
(file)
--- a/
modules/roles/manifests/debug_mirror.pp
+++ b/
modules/roles/manifests/debug_mirror.pp
@@
-1,11
+1,32
@@
class roles::debug_mirror {
class roles::debug_mirror {
+ include roles::archvsync_base
+
$vhost_listen = $::hostname ? {
$vhost_listen = $::hostname ? {
- klecker => '130.89.148.14:80 [2001:610:1908:b000::148:14]:80',
+ klecker => '130.89.148.14:80 [2001:610:1908:b000::148:14]:80 [2001:67c:2564:a119::148:14]:80',
+ mirror-isc => '149.20.4.15:80 [2001:4f8:1:c::15]:80',
+ mirror-conova => '217.196.149.232:80 [2a02:16a8:dc41:100::232]:80',
default => '*:80',
}
default => '*:80',
}
+ $onion_v4_addr = $::hostname ? {
+ klecker => '130.89.148.14',
+ mirror-isc => '149.20.4.15',
+ default => undef,
+ }
apache2::site { '010-debug.mirrors.debian.org':
site => 'debug.mirrors.debian.org',
content => template('roles/apache-debug.mirrors.debian.org.erb'),
}
apache2::site { '010-debug.mirrors.debian.org':
site => 'debug.mirrors.debian.org',
content => template('roles/apache-debug.mirrors.debian.org.erb'),
}
+
+ if has_role('static_mirror_onion') {
+ if ! $onion_v4_addr {
+ fail("Do not have an onion_v4_addr set for $::hostname.")
+ }
+
+ onion::service { 'debug.mirrors.debian.org':
+ port => 80,
+ target_port => 80,
+ target_address => $onion_v4_addr,
+ }
+ }
}
}