X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Fports_mirror.pp;h=7463c8572e32d1bfa17549b39e2f4fa94d58e9bd;hb=33a685862291e6f3c0c7f9df702b930430bbe419;hp=6b20c01eefc536fdc0f86ff38c06485fa64e407d;hpb=bc0932e7d274b8c9466bb5346bf8746010792d33;p=mirror%2Fdsa-puppet.git diff --git a/modules/roles/manifests/ports_mirror.pp b/modules/roles/manifests/ports_mirror.pp index 6b20c01ee..7463c8572 100644 --- a/modules/roles/manifests/ports_mirror.pp +++ b/modules/roles/manifests/ports_mirror.pp @@ -7,7 +7,6 @@ class roles::ports_mirror( Boolean $onion_service = false, ) { include roles::archvsync_base - include apache2 $_enclosed_addresses = empty($listen_addr) ? { @@ -25,7 +24,10 @@ class roles::ports_mirror( } 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?.") } @@ -36,4 +38,6 @@ class roles::ports_mirror( target_address => $onion_addr, } } + + Ferm::Rule::Simple <<| tag == 'ssh::server::from::syncproxy' |>> }