X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Fftp.pp;h=cede5429b9a3457b3bb3062601d8881ba818c0d7;hb=bfcd2cf1ea494a37e5c6ce31f6d3cdfc7fd26433;hp=754b98edc41b3e23497c42ca8c9acc98f8b05f3e;hpb=ca0302fc180922a0843bd5f25fae104f14dff374;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/ftp.pp b/modules/roles/manifests/ftp.pp
index 754b98edc..cede5429b 100644
--- a/modules/roles/manifests/ftp.pp
+++ b/modules/roles/manifests/ftp.pp
@@ -1,28 +1,16 @@
 class roles::ftp {
+	# this is the FTP part of the roles::debian_mirror class
 
-	$bind = $::hostname ? {
-		kassia  => '::ffff:130.89.149.226',
-		klecker => '::ffff:130.89.148.12',
-		default => '',
-	}
-
-	$bind6 = $::hostname ? {
-		kassia  => '2001:610:1908:a000::149:226',
-		klecker => '2001:610:1908:b000::148:12',
-		default => '',
+	$binds = $::hostname ? {
+		klecker => [ '130.89.148.12', '[2001:610:1908:b000::148:12]', '[2001:67c:2564:a119::148:12]' ],
+		default => [ '[::]' ],
 	}
 
 	vsftpd::site { 'ftp':
-		source  => 'puppet:///modules/roles/ftp/vsftpd.conf',
-		logfile => '/var/log/ftp/vsftpd-ftp.debian.org.log',
-		bind    => $bind,
-	}
-
-	if $bind6 {
-		vsftpd::site { 'ftp-v6':
-			source  => 'puppet:///modules/roles/security_mirror/vsftpd.conf',
-			logfile => '/var/log/ftp/vsftpd-ftp.debian.org.log',
-			bind    => $bind6,
-		}
+		banner       => 'ftp.debian.org FTP server',
+		logfile      => '/var/log/ftp/vsftpd-ftp.debian.org.log',
+		binds        => $binds,
+		max_clients  => 200,
+		root         => '/srv/ftp.debian.org/ftp.root',
 	}
 }