X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Fsecurity_mirror.pp;h=7ae7500e711429814f6c9a9d66b9ab2a2a3d4530;hb=2406640350870f6d2ab9112a247fb733590f15de;hp=13cba753058b848c2763374e74652204cc0c2131;hpb=3eb533e5499e66423bafdedaf6c7d08ead1772de;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/security_mirror.pp b/modules/roles/manifests/security_mirror.pp
index 13cba7530..7ae7500e7 100644
--- a/modules/roles/manifests/security_mirror.pp
+++ b/modules/roles/manifests/security_mirror.pp
@@ -1,11 +1,35 @@
 class roles::security_mirror {
+	$rsync_bind = $::hostname ? {
+		mirror-anu => '150.203.164.61',
+		mirror-isc => '149.20.20.19',
+		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-umn => '2607:ea00:101:3c0b::1deb:215',
+		default    => '',
+	}
 
+	include apache2::cache
 	apache2::site { '010-security.debian.org':
 		site   => 'security.debian.org',
-		config => 'puppet:///modules/roles/security_mirror/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/',
 	}
 
-	apache2::site { 'security.debian.org':
-		ensure => absent,
+	rsync::site { 'security':
+		source      => 'puppet:///modules/roles/security_mirror/rsyncd.conf',
+		max_clients => 100,
+		bind        => $rsync_bind,
+		bind6       => $rsync_bind6,
 	}
 }