X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Fsyncproxy.pp;h=146fcda8ba0e14734346719d5b74691409fd95eb;hb=0b90b9722d512bc8e6bc0a90995b3ace1b1b68ed;hp=86ba67cc80e3ff6dbd3a6dde2fcb181afce53102;hpb=0b68381fd31eec6f60601df29d4cf0b137724fad;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/syncproxy.pp b/modules/roles/manifests/syncproxy.pp
index 86ba67cc8..146fcda8b 100644
--- a/modules/roles/manifests/syncproxy.pp
+++ b/modules/roles/manifests/syncproxy.pp
@@ -1,26 +1,27 @@
 class roles::syncproxy {
-	$bind = $::hostname ? {
-		'milanollo' => '5.153.231.9',
-		'mirror-anu' => '150.203.164.60',
-		'mirror-isc' => '149.20.20.21',
-		'mirror-umn' => '128.101.240.216',
-		'klecker' => '130.89.148.10',
-		default => ''
-	}
-	$bind6 = $::hostname ? {
-		'milanollo' => '2001:41c8:1000:21::21:9',
-		'mirror-anu' => '2001:388:1034:2900::3c',
-		'mirror-isc' => '2001:4f8:8:36::1deb:21',
-		'mirror-umn' => '2607:ea00:101:3c0b::1deb:216',
-		'klecker' => '2001:610:1908:b000::148:10',
-		default => ''
+	include roles::archvsync_base
+
+	$mirror_basedir_prefix = hiera('role_config__syncproxy.mirror_basedir_prefix')
+
+	$binds = $::hostname ? {
+		'milanollo'    => [ '5.153.231.9', '[2001:41c8:1000:21::21:9]' ],
+		'mirror-anu'   => [ '150.203.164.60', '[2001:388:1034:2900::3c]' ],
+		'mirror-conova' => [ '217.196.149.237', '[2a02:16a8:dc41:100::237]' ],
+		'mirror-isc'   => [ '149.20.4.16', '[2001:4f8:1:c::16]' ],
+		'mirror-umn'   => [ '128.101.240.216', '[2607:ea00:101:3c0b::1deb:216]' ],
+		'klecker'      => [ '130.89.148.10', '[2001:610:1908:b000::148:10]',
+		                    '[2001:67c:2564:a119::148:10]' ],
+		'gretchaninov' => [ '209.87.16.40', '[2607:f8f0:614:1::1274:40]' ],
+		default        => [ '[::]' ],
 	}
 	$syncproxy_name = $::hostname ? {
 		'milanollo' => 'syncproxy3.eu.debian.org',
 		'mirror-anu' => 'syncproxy.au.debian.org',
+		'mirror-conova' => 'syncproxy4.eu.debian.org',
 		'mirror-isc' => 'syncproxy2.wna.debian.org',
 		'mirror-umn' => 'syncproxy.cna.debian.org',
 		'klecker' => 'syncproxy2.eu.debian.org',
+		'gretchaninov' => 'syncproxy3.wna.debian.org',
 		default => 'unknown'
 	}
 
@@ -31,13 +32,13 @@ class roles::syncproxy {
 	file { '/etc/rsyncd/debian.secrets':
 		owner => 'root',
 		group => 'mirroradm',
-		mode => 0660,
+		mode => '0660',
 	}
 
 	if $::apache2 and $syncproxy_name != 'unknown' {
 		include apache2::ssl
-		ssl::service {
-			"$syncproxy_name": notify => Service['apache2'],
+		ssl::service { "$syncproxy_name":
+			notify  => Exec['service apache2 reload'],
 			key => true,
 		}
 		apache2::site { '010-syncproxy.debian.org':
@@ -55,15 +56,13 @@ class roles::syncproxy {
 
 		rsync::site { 'syncproxy':
 			content => template('roles/syncproxy/rsyncd.conf.erb'),
-			bind    => $bind,
-			bind6   => $bind6,
+			binds   => $binds,
 			sslname => "$syncproxy_name",
 		}
 	} else {
 		rsync::site { 'syncproxy':
 			content => template('roles/syncproxy/rsyncd.conf.erb'),
-			bind    => $bind,
-			bind6   => $bind6,
+			binds   => $binds,
 		}
 	}
 }