X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Fftp.pp;h=95fd87d6dd746aeb8ca833fe759c61f77aa8c932;hb=f7e0f993132d508cee94cf091f953ceefaf13c9c;hp=27c4480b1ac60bd7d71105573adfc98dc139b39c;hpb=7e9f3801f497c8f0a05094e04656f059fc903e56;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/ftp.pp b/modules/roles/manifests/ftp.pp
index 27c4480b1..95fd87d6d 100644
--- a/modules/roles/manifests/ftp.pp
+++ b/modules/roles/manifests/ftp.pp
@@ -1,5 +1,32 @@
 class roles::ftp {
+
+	include ferm::ftp_conntrack
+
+	$bind = $::hostname ? {
+		klecker => '::ffff:130.89.148.12',
+		default => '',
+	}
+
+	$bind6 = $::hostname ? {
+		klecker => '2001:610:1908:b000::148:12',
+		default => '',
+	}
+
 	vsftpd::site { 'ftp':
-		source => 'puppet:///modules/roles/ftp/vsftpd.conf'
+		banner       => 'ftp.debian.org FTP server',
+		logfile      => '/var/log/ftp/vsftpd-ftp.debian.org.log',
+		bind         => $bind,
+		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',
+		}
 	}
 }