X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Fsecurity_mirror.pp;h=a2d5aeef3d4e48c5ef18675c72eaed71f6b9a1dd;hb=1ab297e177f78afa9ae4ff44ba3110fbec30beee;hp=2b1baf6117fa0d45ee793e9d7188dfe551588339;hpb=107a00c9b97e8ba32c823c510bbbe8b747290963;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/security_mirror.pp b/modules/roles/manifests/security_mirror.pp
index 2b1baf611..a2d5aeef3 100644
--- a/modules/roles/manifests/security_mirror.pp
+++ b/modules/roles/manifests/security_mirror.pp
@@ -1,32 +1,82 @@
 class roles::security_mirror {
+	include roles::archvsync_base
 
-	apache2::site { '010-security.debian.org':
-		site   => 'security.debian.org',
-		config => 'puppet:///modules/roles/security_mirror/security.debian.org'
+	$rsync_bind = $::hostname ? {
+		mirror-anu => '150.203.164.61',
+		mirror-isc => '149.20.4.14',
+		mirror-umn => '128.101.240.215',
+		default    => '',
 	}
-
-	$bind = $::hostname ? {
+	$rsync_bind6 = $::hostname ? {
+		mirror-anu => '2001:388:1034:2900::3d',
+		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,
+	}
 
-	$bind6 = $::hostname ? {
-		default => '',
+	file { '/srv/mirrors/debian-security':
+		ensure => link,
+		target => '../ftp.root/debian-security',
 	}
 
-	$logfile = '/var/log/ftp/vsftpd-security.debian.org.log'
+	include apache2::expires
+	include apache2::rewrite
 
-	vsftpd::site { 'security':
-		source  => template('roles/security_mirror/vsftpd.conf.erb'),
-		logfile => $logfile,
-		bind    => $bind,
+	apache2::site { '010-security.debian.org':
+		site   => 'security.debian.org',
+		content => template('roles/security_mirror/security.debian.org.erb')
 	}
 
-	if $bind6 {
-		vsftpd::site { 'security-v6':
-			source  => template('roles/security_mirror/vsftpd.conf.erb'),
-			logfile => $logfile,
-			bind    => $bind6,
+	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':
+			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':
+		source      => 'puppet:///modules/roles/security_mirror/rsyncd.conf',
+		max_clients => 100,
+		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,
+		}
+	}
 }