X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Fftp.pp;h=452c4597c4a1bfa53a782138c8a6023fabca7406;hb=8e6ac9400406e5103b273b667bfa427c9bb5e87d;hp=febecf6ef8f498625952a84608daf3a0b70120d5;hpb=3bdba330fd5120b6a8e2f624d5ba72d08ded558c;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/ftp.pp b/modules/roles/manifests/ftp.pp
index febecf6ef..452c4597c 100644
--- a/modules/roles/manifests/ftp.pp
+++ b/modules/roles/manifests/ftp.pp
@@ -1,30 +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 => '',
+	$binds = $::hostname ? {
+		klecker => [ '130.89.148.12', '[2001:610:1908:b000::148:12]' ],
+		default => [ '[::]' ],
 	}
 
-	$bind6 = $::hostname ? {
-		kassia  => '2001:610:1908:a000::149:226',
-		klecker => '2001:610:1908:b000::148:12',
-		default => '',
-	}
-
-	$logfile = '/var/log/ftp/vsftpd-ftp.debian.org.log'
-
 	vsftpd::site { 'ftp':
-		content => template('roles/ftp/vsftpd.conf.erb'),
-		logfile => $logfile,
-		bind    => $bind,
-	}
-
-	if $bind6 {
-		vsftpd::site { 'ftp-v6':
-			content => template('roles/ftp/vsftpd.conf.erb'),
-			logfile => $logfile,
-			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',
 	}
 }