X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=modules%2Froles%2Fmanifests%2Fftp.pp;h=5823032cc730ee1a4dee22f34dda7e73f265d5fc;hb=5024ebc9b2c219d411e8a1f50fd7767d8004cb6d;hp=0ae4254e569390e21cbb326151ab1380acc56e38;hpb=6a02cbaab2c9399fb86b883037fad6e894b2d790;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/ftp.pp b/modules/roles/manifests/ftp.pp
index 0ae4254e5..5823032cc 100644
--- a/modules/roles/manifests/ftp.pp
+++ b/modules/roles/manifests/ftp.pp
@@ -1,13 +1,14 @@
 class roles::ftp {
+	# this is the FTP part of the roles::debian_mirror class
+
+	include ferm::ftp_conntrack
 
 	$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 => '',
 	}
@@ -20,7 +21,7 @@ class roles::ftp {
 		root         => '/srv/ftp.debian.org/ftp.root',
 	}
 
-	if $bind6 {
+	if $bind6 != '' {
 		vsftpd::site { 'ftp-v6':
 			banner       => 'ftp.debian.org FTP server',
 			logfile      => '/var/log/ftp/vsftpd-ftp.debian.org.log',