X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Fsyncproxy.pp;h=510e1e9124cfa4962ebe8a017f3640843372e6bb;hb=d2009585094ac0f116f07c722ecb4a5117bf82e1;hp=20c3320c6c061334cf46b35ffef728295bbac403;hpb=db7f690e78e841650e026edc9f59d3aa5b07c11d;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/syncproxy.pp b/modules/roles/manifests/syncproxy.pp
index 20c3320c6..510e1e912 100644
--- a/modules/roles/manifests/syncproxy.pp
+++ b/modules/roles/manifests/syncproxy.pp
@@ -1,14 +1,18 @@
 class roles::syncproxy {
 	rsync::site { 'syncproxy':
-		source => 'puppet:///modules/roles/syncproxy/rsyncd.conf',
+		content => template('roles/syncproxy/rsyncd.conf.erb'),
 		bind   => $::hostname ? {
 			'milanollo' => '5.153.231.9',
+			'mirror-isc' => '149.20.20.21',
+			'mirror-umn' => '128.101.240.216',
 			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',
 			default => ''
-		}
+		},
 	}
 
 	file { '/etc/rsyncd':
@@ -18,6 +22,6 @@ class roles::syncproxy {
 	file { '/etc/rsyncd/debian.secrets':
 		owner => 'root',
 		group => 'mirroradm',
-		mode => 0664,
+		mode => 0660,
 	}
 }