X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Fsyncproxy.pp;h=146fcda8ba0e14734346719d5b74691409fd95eb;hb=3b8f6afb92c2ca70911fe3dc67c9a23001ff99de;hp=bc0e27506760032c0d7d8e22c8a34e5ae4c7fddd;hpb=08d03e5feeda48ea91899723368e88e24a9b4708;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/syncproxy.pp b/modules/roles/manifests/syncproxy.pp
index bc0e27506..146fcda8b 100644
--- a/modules/roles/manifests/syncproxy.pp
+++ b/modules/roles/manifests/syncproxy.pp
@@ -1,18 +1,23 @@
 class roles::syncproxy {
 	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]' ],
+		'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',
@@ -49,13 +54,13 @@ class roles::syncproxy {
 			content => template('roles/syncproxy/syncproxy.debian.org-index.html.erb')
 		}
 
-		rsync::site_systemd { 'syncproxy':
+		rsync::site { 'syncproxy':
 			content => template('roles/syncproxy/rsyncd.conf.erb'),
 			binds   => $binds,
 			sslname => "$syncproxy_name",
 		}
 	} else {
-		rsync::site_systemd { 'syncproxy':
+		rsync::site { 'syncproxy':
 			content => template('roles/syncproxy/rsyncd.conf.erb'),
 			binds   => $binds,
 		}