X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Fsecurity_mirror.pp;h=0541533320fcff8befbd1484495284233fac1c80;hb=26bc980392c5213fd04962602529c04493f8dcb7;hp=fc19e41a10bcb69b404b358cb1e32add0266423c;hpb=3bdba330fd5120b6a8e2f624d5ba72d08ded558c;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/security_mirror.pp b/modules/roles/manifests/security_mirror.pp
index fc19e41a1..054153332 100644
--- a/modules/roles/manifests/security_mirror.pp
+++ b/modules/roles/manifests/security_mirror.pp
@@ -1,32 +1,31 @@
 class roles::security_mirror {
-
-	apache2::site { '010-security.debian.org':
-		site   => 'security.debian.org',
-		config => 'puppet:///modules/roles/security_mirror/security.debian.org'
+	$rsync_bind = $::hostname ? {
+		mirror-isc => '149.20.20.19',
+		default    => '',
 	}
-
-	$bind = $::hostname ? {
-		default => '',
+	$rsync_bind6 = $::hostname ? {
+		mirror-isc => '2001:4f8:8:36::1deb:19',
+		default    => '',
 	}
 
-	$bind6 = $::hostname ? {
-		default => '',
+	include apache2::cache
+	apache2::site { '010-security.debian.org':
+		site   => 'security.debian.org',
+		content => template('roles/security_mirror/security.debian.org.erb')
 	}
 
-	$logfile = '/var/log/ftp/vsftpd-security.debian.org.log'
-
+	include ferm::ftp_conntrack
 	vsftpd::site { 'security':
-		content => template('roles/security_mirror/vsftpd.conf.erb'),
-		logfile => $logfile,
-		bind    => $bind,
+		banner       => 'security.debian.org FTP server (vsftpd)',
+		logfile      => '/var/log/ftp/vsftpd-security.debian.org.log',
+		max_clients  => 200,
+		root         => '/srv/ftp.root/',
 	}
 
-	if $bind6 {
-		vsftpd::site { 'security-v6':
-			content => template('roles/security_mirror/vsftpd.conf.erb'),
-			logfile => $logfile,
-			bind    => $bind6,
-		}
+	rsync::site { 'security':
+		source      => 'puppet:///modules/roles/security_mirror/rsyncd.conf',
+		max_clients => 100,
+		bind        => $rsync_bind,
+		bind6       => $rsync_bind6,
 	}
-
 }