X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Fsecurity_mirror.pp;h=d135ffe41f36fb2de96b59c2524d89641983c6d3;hb=4939162b3524926ead9e4a832c314b78d379b770;hp=04a0d7faddf647019532d0919d770d246ead4125;hpb=5e199891f346b162798dc59c128a08d1ad0d7fbf;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/security_mirror.pp b/modules/roles/manifests/security_mirror.pp
index 04a0d7fad..d135ffe41 100644
--- a/modules/roles/manifests/security_mirror.pp
+++ b/modules/roles/manifests/security_mirror.pp
@@ -1,46 +1,61 @@
 class roles::security_mirror {
+	include roles::archvsync_base
+
 	$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',
 		default    => '',
 	}
 	$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_bind = $rsync_bind
+	$ftp_bind6 = $rsync_bind6
+
+	file { '/srv/mirrors/debian-security':
+		ensure => link,
+		target => '../ftp.root/debian-security',
 	}
-	$ftp_bind6 = $::hostname ? {
-		mirror-anu => '2001:388:1034:2900::3d',
-		default => undef,
+	file { '/srv/ftp.root/.nobackup':
+		ensure  => present,
+		content => '',
 	}
 
-	include apache2::cache
+	include apache2::expires
+	include apache2::rewrite
+
 	apache2::site { '010-security.debian.org':
 		site   => 'security.debian.org',
 		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,
+			}
 		}
 	}
 
@@ -51,7 +66,6 @@ class roles::security_mirror {
 		bind6       => $rsync_bind6,
 	}
 
-
 	$onion_v4_addr = $::hostname ? {
 		mirror-anu => '150.203.164.61',
 		mirror-isc => '149.20.4.14',