X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Fports_mirror.pp;h=7463c8572e32d1bfa17549b39e2f4fa94d58e9bd;hb=33a685862291e6f3c0c7f9df702b930430bbe419;hp=d8ae988ebe9524e697ed95bca628c20a0e22bdda;hpb=f27fe3672a80c193e476904e190092fd15f718df;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/ports_mirror.pp b/modules/roles/manifests/ports_mirror.pp
index d8ae988eb..7463c8572 100644
--- a/modules/roles/manifests/ports_mirror.pp
+++ b/modules/roles/manifests/ports_mirror.pp
@@ -1,12 +1,20 @@
+# a mirror of ports.debian.org
+#
+# @param listen_addr IP addresses to have apache listen on
+# @param onion_service provide the onion service from this host
 class roles::ports_mirror(
-  String  $vhost_listen = '*:80',
+  Array[Stdlib::IP::Address] $listen_addr = [],
   Boolean $onion_service = false,
-  Optional[Stdlib::IP::Address] $onion_addr = undef,
 ) {
   include roles::archvsync_base
-
   include apache2
 
+  $_enclosed_addresses = empty($listen_addr) ? {
+    true    => ['*'],
+    default => enclose_ipv6($listen_addr),
+  }
+  $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"
 
@@ -16,8 +24,12 @@ class roles::ports_mirror(
   }
 
   if $onion_service {
+    $onion_addr = empty($listen_addr) ? {
+      true    => $base::public_address,
+      default => filter_ipv4($listen_addr)[0]
+    }
     if ! $onion_addr {
-      fail("Do not have an onion_addr set for ${::hostname}.")
+      fail("Do not have a useable address for the onionservice on ${::hostname}.  Is \$listen_addr empty or does it not have an IPv4 address?.")
     }
 
     onion::service { 'ftp.ports.debian.org':
@@ -26,4 +38,6 @@ class roles::ports_mirror(
       target_address => $onion_addr,
     }
   }
+
+  Ferm::Rule::Simple <<| tag == 'ssh::server::from::syncproxy' |>>
 }