X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Fsecurity_mirror.pp;h=1cda924c6d3c65b8cf1f29bb97c34d0300fc0aa1;hb=fbefe2a0954ce5e66f8cd203c99f9dcaa61cffa8;hp=1d2f731f21f339b00f9eb34576356dd3e0e9c9f5;hpb=acd118afa78febf113efd594bb0a8b01024f5360;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/security_mirror.pp b/modules/roles/manifests/security_mirror.pp
index 1d2f731f2..1cda924c6 100644
--- a/modules/roles/manifests/security_mirror.pp
+++ b/modules/roles/manifests/security_mirror.pp
@@ -3,6 +3,7 @@ class roles::security_mirror {
 
 	$rsync_bind = $::hostname ? {
 		mirror-anu => '150.203.164.61',
+		mirror-bytemark => '5.153.231.46',
 		mirror-conova => '217.196.149.233',
 		mirror-isc => '149.20.4.14',
 		mirror-umn => '128.101.240.215',
@@ -10,19 +11,14 @@ class roles::security_mirror {
 	}
 	$rsync_bind6 = $::hostname ? {
 		mirror-anu => '2001:388:1034:2900::3d',
+		mirror-bytemark => '2001:41c8:1000:21::21:46',
 		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,
@@ -41,21 +37,25 @@ class roles::security_mirror {
 		content => template('roles/security_mirror/security.debian.org.erb')
 	}
 
-	include ferm::ftp_conntrack
-	vsftpd::site { 'security':
-		banner       => 'security.debian.org FTP server (vsftpd)',
-		logfile      => '/var/log/ftp/vsftpd-security.debian.org.log',
-		max_clients  => 200,
-		root         => '/srv/ftp.root/',
-		bind         => $ftp_bind,
-	}
-	if ($ftp_bind6) {
-		vsftpd::site { 'security6':
+	if has_role('security_mirror_no_ftp') {
+	 # nop
+	} else {
+		include ferm::ftp_conntrack
+		vsftpd::site { 'security':
 			banner       => 'security.debian.org FTP server (vsftpd)',
-			logfile      => '/var/log/ftp/vsftpd-security6.debian.org.log',
+			logfile      => '/var/log/ftp/vsftpd-security.debian.org.log',
 			max_clients  => 200,
 			root         => '/srv/ftp.root/',
-			bind         => $ftp_bind6,
+			bind         => $ftp_bind,
+		}
+		if ($ftp_bind6) {
+			vsftpd::site { 'security6':
+				banner       => 'security.debian.org FTP server (vsftpd)',
+				logfile      => '/var/log/ftp/vsftpd-security6.debian.org.log',
+				max_clients  => 200,
+				root         => '/srv/ftp.root/',
+				bind         => $ftp_bind6,
+			}
 		}
 	}