X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Fsecurity_mirror.pp;h=924ec12d6a1602f1bc6cf4621747170bae028673;hb=a3f27248848dc5726cdd2708aeb885953e6369f6;hp=a2d5aeef3d4e48c5ef18675c72eaed71f6b9a1dd;hpb=9fcfecbfcca2dcf3f446d3b6fe989f40143392f4;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/security_mirror.pp b/modules/roles/manifests/security_mirror.pp
index a2d5aeef3..924ec12d6 100644
--- a/modules/roles/manifests/security_mirror.pp
+++ b/modules/roles/manifests/security_mirror.pp
@@ -3,29 +3,29 @@ class roles::security_mirror {
 
 	$rsync_bind = $::hostname ? {
 		mirror-anu => '150.203.164.61',
+		mirror-conova => '217.196.149.233',
 		mirror-isc => '149.20.4.14',
 		mirror-umn => '128.101.240.215',
 		default    => '',
 	}
 	$rsync_bind6 = $::hostname ? {
 		mirror-anu => '2001:388:1034:2900::3d',
+		mirror-conova => '2a02:16a8:dc41:100::233',
 		mirror-isc => '2001:4f8:1:c::14',
 		mirror-umn => '2607:ea00:101:3c0b::1deb:215',
 		default    => '',
 	}
-	$ftp_bind = $::hostname ? {
-		mirror-anu => '150.203.164.61',
-		default => '',
-	}
-	$ftp_bind6 = $::hostname ? {
-		mirror-anu => '2001:388:1034:2900::3d',
-		default => undef,
-	}
+	$ftp_bind = $rsync_bind
+	$ftp_bind6 = $rsync_bind6
 
 	file { '/srv/mirrors/debian-security':
 		ensure => link,
 		target => '../ftp.root/debian-security',
 	}
+	file { '/srv/ftp.root/.nobackup':
+		ensure  => present,
+		content => '',
+	}
 
 	include apache2::expires
 	include apache2::rewrite