X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Fsyncproxy.pp;h=62430bf9aa2ad1c6a4741c10546950ff611dce61;hb=1ab297e177f78afa9ae4ff44ba3110fbec30beee;hp=b01232b39c9df0ad866739bfaebb86ae7c34a439;hpb=37156e346e477049590bce51da09cc7f11726098;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/syncproxy.pp b/modules/roles/manifests/syncproxy.pp
index b01232b39..62430bf9a 100644
--- a/modules/roles/manifests/syncproxy.pp
+++ b/modules/roles/manifests/syncproxy.pp
@@ -1,8 +1,10 @@
 class roles::syncproxy {
+	include roles::archvsync_base
+
 	$bind = $::hostname ? {
 		'milanollo' => '5.153.231.9',
 		'mirror-anu' => '150.203.164.60',
-		'mirror-isc' => '149.20.20.21',
+		'mirror-isc' => '149.20.4.16',
 		'mirror-umn' => '128.101.240.216',
 		'klecker' => '130.89.148.10',
 		default => ''
@@ -10,7 +12,7 @@ class roles::syncproxy {
 	$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-isc' => '2001:4f8:1:c::16',
 		'mirror-umn' => '2607:ea00:101:3c0b::1deb:216',
 		'klecker' => '2001:610:1908:b000::148:10',
 		default => ''
@@ -24,12 +26,6 @@ class roles::syncproxy {
 		default => 'unknown'
 	}
 
-	rsync::site { 'syncproxy':
-		content => template('roles/syncproxy/rsyncd.conf.erb'),
-		bind    => $bind,
-		bind6   => $bind6,
-	}
-
 	file { '/etc/rsyncd':
 		ensure => 'directory'
 	}
@@ -41,7 +37,11 @@ class roles::syncproxy {
 	}
 
 	if $::apache2 and $syncproxy_name != 'unknown' {
-		ssl::service { "$syncproxy_name": notify => Service['apache2'], key => true, }
+		include apache2::ssl
+		ssl::service { "$syncproxy_name":
+			notify  => Exec['service apache2 reload'],
+			key => true,
+		}
 		apache2::site { '010-syncproxy.debian.org':
 			site   => 'syncproxy.debian.org',
 			content => template('roles/syncproxy/syncproxy.debian.org-apache.erb')
@@ -54,5 +54,18 @@ class roles::syncproxy {
 		file { '/srv/www/syncproxy.debian.org/htdocs/index.html':
 			content => template('roles/syncproxy/syncproxy.debian.org-index.html.erb')
 		}
+
+		rsync::site { 'syncproxy':
+			content => template('roles/syncproxy/rsyncd.conf.erb'),
+			bind    => $bind,
+			bind6   => $bind6,
+			sslname => "$syncproxy_name",
+		}
+	} else {
+		rsync::site { 'syncproxy':
+			content => template('roles/syncproxy/rsyncd.conf.erb'),
+			bind    => $bind,
+			bind6   => $bind6,
+		}
 	}
 }