X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Fsyncproxy.pp;h=bf19bd0166a609de6a0a638be5841663c4f590bc;hb=4b7e953b4fc1977b4c6f39e22e75b646dbe4f1cd;hp=7bd8fa04b426cce4bf52fd8867a0c5f24d0ad591;hpb=fbced29861da3702938214cb41db5aa30c45a65e;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/syncproxy.pp b/modules/roles/manifests/syncproxy.pp
index 7bd8fa04b..bf19bd016 100644
--- a/modules/roles/manifests/syncproxy.pp
+++ b/modules/roles/manifests/syncproxy.pp
@@ -1,10 +1,23 @@
 class roles::syncproxy {
+	$bind = $::hostname ? {
+		'milanollo' => '5.153.231.9',
+		'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-isc' => '2001:4f8:8:36::1deb:21',
+		'mirror-umn' => '2607:ea00:101:3c0b::1deb:216',
+		'klecker' => '2001:610:1908:b000::148:10',
+		default => ''
+	}
+
 	rsync::site { 'syncproxy':
-		source => 'puppet:///modules/roles/syncproxy/rsyncd.conf',
-		bind   => $::hostname ? {
-			'milanollo' => '5.153.231.9',
-			default => ''
-		}
+		content => template('roles/syncproxy/rsyncd.conf.erb'),
+		bind    => $bind,
+		bind6   => $bind6,
 	}
 
 	file { '/etc/rsyncd':
@@ -14,6 +27,6 @@ class roles::syncproxy {
 	file { '/etc/rsyncd/debian.secrets':
 		owner => 'root',
 		group => 'mirroradm',
-		mode => 0664,
+		mode => 0660,
 	}
 }