X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Fsyncproxy.pp;h=5d12d297f6b4e7f65a3a73b36b67eb0d20f53bb7;hb=fbefe2a0954ce5e66f8cd203c99f9dcaa61cffa8;hp=202cabda03a37e01383ed8465199f9bb01fbf53f;hpb=9dff55b7bb4bf4377c80bc636ca14bf45a5ce041;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/syncproxy.pp b/modules/roles/manifests/syncproxy.pp
index 202cabda0..5d12d297f 100644
--- a/modules/roles/manifests/syncproxy.pp
+++ b/modules/roles/manifests/syncproxy.pp
@@ -1,18 +1,22 @@
 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',
+		'gretchaninov' => '209.87.16.40',
 		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-isc' => '2001:4f8:1:c::16',
 		'mirror-umn' => '2607:ea00:101:3c0b::1deb:216',
 		'klecker' => '2001:610:1908:b000::148:10',
+		'gretchaninov' => '2607:f8f0:614:1::1274:40',
 		default => ''
 	}
 	$syncproxy_name = $::hostname ? {
@@ -21,6 +25,7 @@ class roles::syncproxy {
 		'mirror-isc' => 'syncproxy2.wna.debian.org',
 		'mirror-umn' => 'syncproxy.cna.debian.org',
 		'klecker' => 'syncproxy2.eu.debian.org',
+		'gretchaninov' => 'syncproxy3.wna.debian.org',
 		default => 'unknown'
 	}
 
@@ -37,7 +42,7 @@ class roles::syncproxy {
 	if $::apache2 and $syncproxy_name != 'unknown' {
 		include apache2::ssl
 		ssl::service { "$syncproxy_name":
-			notify => Service['apache2'],
+			notify  => Exec['service apache2 reload'],
 			key => true,
 		}
 		apache2::site { '010-syncproxy.debian.org':