projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
wiki -> hiera role; explicitly include apache2
[mirror/dsa-puppet.git]
/
modules
/
roles
/
manifests
/
ports_mirror.pp
diff --git
a/modules/roles/manifests/ports_mirror.pp
b/modules/roles/manifests/ports_mirror.pp
index
9b538ce
..
d8ae988
100644
(file)
--- a/
modules/roles/manifests/ports_mirror.pp
+++ b/
modules/roles/manifests/ports_mirror.pp
@@
-1,5
+1,7
@@
class roles::ports_mirror(
class roles::ports_mirror(
+ String $vhost_listen = '*:80',
Boolean $onion_service = false,
Boolean $onion_service = false,
+ Optional[Stdlib::IP::Address] $onion_addr = undef,
) {
include roles::archvsync_base
) {
include roles::archvsync_base
@@
-8,32
+10,20
@@
class roles::ports_mirror(
$mirror_basedir_prefix = hiera('role_config__mirrors.mirror_basedir_prefix')
$archive_root = "${mirror_basedir_prefix}debian-ports"
$mirror_basedir_prefix = hiera('role_config__mirrors.mirror_basedir_prefix')
$archive_root = "${mirror_basedir_prefix}debian-ports"
- $vhost_listen = $::hostname ? {
- klecker => '130.89.148.14:80 [2001:67c:2564:a119::148:14]:80',
- mirror-isc => '149.20.4.15:80 [2001:4f8:1:c::15]:80',
- default => '*:80',
- }
-
apache2::site { '010-ftp.ports.debian.org':
site => 'ftp.ports.debian.org',
content => template('roles/apache-ftp.ports.debian.org.erb'),
}
if $onion_service {
apache2::site { '010-ftp.ports.debian.org':
site => 'ftp.ports.debian.org',
content => template('roles/apache-ftp.ports.debian.org.erb'),
}
if $onion_service {
- $onion_v4_addr = $::hostname ? {
- klecker => '130.89.148.14',
- mirror-isc => '149.20.4.15',
- default => undef,
- }
-
- if ! $onion_v4_addr {
- fail("Do not have an onion_v4_addr set for $::hostname.")
+ if ! $onion_addr {
+ fail("Do not have an onion_addr set for ${::hostname}.")
}
onion::service { 'ftp.ports.debian.org':
port => 80,
target_port => 80,
}
onion::service { 'ftp.ports.debian.org':
port => 80,
target_port => 80,
- target_address => $onion_
v4_
addr,
+ target_address => $onion_addr,
}
}
}
}
}
}