X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Fftp.pp;h=cede5429b9a3457b3bb3062601d8881ba818c0d7;hb=9b17251659b22a13b308212ee02303ed208b3464;hp=5823032cc730ee1a4dee22f34dda7e73f265d5fc;hpb=0aa995655b6a58e2c9418845c50d42e6565c9c7b;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/ftp.pp b/modules/roles/manifests/ftp.pp
index 5823032cc..cede5429b 100644
--- a/modules/roles/manifests/ftp.pp
+++ b/modules/roles/manifests/ftp.pp
@@ -1,33 +1,16 @@
 class roles::ftp {
 	# this is the FTP part of the roles::debian_mirror class
 
-	include ferm::ftp_conntrack
-
-	$bind = $::hostname ? {
-		klecker => '::ffff:130.89.148.12',
-		default => '',
-	}
-
-	$bind6 = $::hostname ? {
-		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':
 		banner       => 'ftp.debian.org FTP server',
 		logfile      => '/var/log/ftp/vsftpd-ftp.debian.org.log',
-		bind         => $bind,
+		binds        => $binds,
 		max_clients  => 200,
 		root         => '/srv/ftp.debian.org/ftp.root',
 	}
-
-	if $bind6 != '' {
-		vsftpd::site { 'ftp-v6':
-			banner       => 'ftp.debian.org FTP server',
-			logfile      => '/var/log/ftp/vsftpd-ftp.debian.org.log',
-			bind         => $bind6,
-			max_clients  => 200,
-			root         => '/srv/ftp.debian.org/ftp.root',
-		}
-	}
 }