X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Fports_mirror.pp;h=d8ae988ebe9524e697ed95bca628c20a0e22bdda;hb=cc43dd4aaf3660a361c1443393a63737da2814aa;hp=31cf1b5686c9857168b980c0c5b5c2722b3ed3c6;hpb=0f978b5d766ecb41aaabd0042c090138da96c04a;p=mirror%2Fdsa-puppet.git

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