X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=modules%2Froles%2Fmanifests%2Fsecurity_mirror.pp;h=470fb4a45aeb85c3ae91900ef0dc42c01d82c0da;hb=e83e2d97e5329921a630f5c18fe54a43772d458b;hp=7ae7500e711429814f6c9a9d66b9ab2a2a3d4530;hpb=1d61cce606a3235927070cdf85c5330706e1a7f2;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/security_mirror.pp b/modules/roles/manifests/security_mirror.pp
index 7ae7500e7..470fb4a45 100644
--- a/modules/roles/manifests/security_mirror.pp
+++ b/modules/roles/manifests/security_mirror.pp
@@ -1,18 +1,28 @@
 class roles::security_mirror {
 	$rsync_bind = $::hostname ? {
 		mirror-anu => '150.203.164.61',
-		mirror-isc => '149.20.20.19',
+		mirror-isc => '149.20.4.14',
 		mirror-umn => '128.101.240.215',
 		default    => '',
 	}
 	$rsync_bind6 = $::hostname ? {
 		mirror-anu => '2001:388:1034:2900::3d',
-		mirror-isc => '2001:4f8:8:36::1deb:19',
+		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,
+	}
+
+	include apache2::expires
+	include apache2::rewrite
 
-	include apache2::cache
 	apache2::site { '010-security.debian.org':
 		site   => 'security.debian.org',
 		content => template('roles/security_mirror/security.debian.org.erb')
@@ -24,6 +34,16 @@ class roles::security_mirror {
 		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':
+			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,
+		}
 	}
 
 	rsync::site { 'security':
@@ -32,4 +52,25 @@ class roles::security_mirror {
 		bind        => $rsync_bind,
 		bind6       => $rsync_bind6,
 	}
+
+
+	$onion_v4_addr = $::hostname ? {
+		mirror-anu => '150.203.164.61',
+		mirror-isc => '149.20.4.14',
+		mirror-umn => '128.101.240.215',
+		villa      => '212.211.132.32',
+		lobos      => '212.211.132.250',
+		default   => undef,
+	}
+	if has_role('security_mirror_onion') {
+		if ! $onion_v4_addr {
+			fail("Do not have an onion_v4_addr set for $::hostname.")
+		}
+
+		onion::service { 'security.debian.org':
+			port => 80,
+			target_port => 80,
+			target_address => $onion_v4_addr,
+		}
+	}
 }