projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Extend lifetime of db.d.o archive key by a year
[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
1f31af2
..
7463c85
100644
(file)
--- a/
modules/roles/manifests/ports_mirror.pp
+++ b/
modules/roles/manifests/ports_mirror.pp
@@
-7,15
+7,13
@@
class roles::ports_mirror(
Boolean $onion_service = false,
) {
include roles::archvsync_base
Boolean $onion_service = false,
) {
include roles::archvsync_base
-
include apache2
$_enclosed_addresses = empty($listen_addr) ? {
true => ['*'],
default => enclose_ipv6($listen_addr),
}
include apache2
$_enclosed_addresses = empty($listen_addr) ? {
true => ['*'],
default => enclose_ipv6($listen_addr),
}
- $_addr_port_elements = $_enclosed_addresses.map |$a| { "${a}:80" }
- $vhost_listen = join($_addr_port_elements, ' ')
+ $vhost_listen = $_enclosed_addresses.map |$a| { "${a}:80" } .join(' ')
$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"
@@
-26,7
+24,10
@@
class roles::ports_mirror(
}
if $onion_service {
}
if $onion_service {
- $onion_addr = filter_ipv4($listen_addr)[0]
+ $onion_addr = empty($listen_addr) ? {
+ true => $base::public_address,
+ default => filter_ipv4($listen_addr)[0]
+ }
if ! $onion_addr {
fail("Do not have a useable address for the onionservice on ${::hostname}. Is \$listen_addr empty or does it not have an IPv4 address?.")
}
if ! $onion_addr {
fail("Do not have a useable address for the onionservice on ${::hostname}. Is \$listen_addr empty or does it not have an IPv4 address?.")
}
@@
-37,4
+38,6
@@
class roles::ports_mirror(
target_address => $onion_addr,
}
}
target_address => $onion_addr,
}
}
+
+ Ferm::Rule::Simple <<| tag == 'ssh::server::from::syncproxy' |>>
}
}