move 3rd party nameserver info from the ferm template to hiera, retire geodns old...

[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 a2f5bfa..d8ae988 100644 (file)
--- a/modules/roles/manifests/ports_mirror.pp
+++ b/modules/roles/manifests/ports_mirror.pp
@@ -1,31 +1,29 @@
-class roles::ports_mirror {
-       include roles::archvsync_base
+class roles::ports_mirror(
+  String  $vhost_listen = '*:80',
+  Boolean $onion_service = false,
+  Optional[Stdlib::IP::Address] $onion_addr = undef,
+) {
+  include roles::archvsync_base
 
-       $vhost_listen = $::hostname ? {
-               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',
-               default => '*:80',
-       }
-       $onion_v4_addr = $::hostname ? {
-               klecker    => '130.89.148.14',
-               mirror-isc => '149.20.4.15',
-               default    => undef,
-       }
+  include apache2
 
-       apache2::site { '010-ftp.ports.debian.org':
-               site   => 'ftp.ports.debian.org',
-               content => template('roles/apache-ftp.ports.debian.org.erb'),
-       }
+  $mirror_basedir_prefix = hiera('role_config__mirrors.mirror_basedir_prefix')
+  $archive_root = "${mirror_basedir_prefix}debian-ports"
 
-       if has_role('static_mirror_onion') {
-               if ! $onion_v4_addr {
-                       fail("Do not have an onion_v4_addr set for $::hostname.")
-               }
+  apache2::site { '010-ftp.ports.debian.org':
+    site    => 'ftp.ports.debian.org',
+    content => template('roles/apache-ftp.ports.debian.org.erb'),
+  }
 
-               onion::service { 'ftp.ports.debian.org':
-                       port => 80,
-                       target_port => 80,
-                       target_address => $onion_v4_addr,
-               }
-       }
+  if $onion_service {
+    if ! $onion_addr {
+      fail("Do not have an onion_addr set for ${::hostname}.")
+    }
+
+    onion::service { 'ftp.ports.debian.org':
+      port           => 80,
+      target_port    => 80,
+      target_address => $onion_addr,
+    }
+  }
 }