X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Fftp.pp;h=95fd87d6dd746aeb8ca833fe759c61f77aa8c932;hb=03c8bdc59da778e70a832fff2d867c0caf6dfa54;hp=634473cf8586416f6605f3081fb597cf0013a930;hpb=9af7908c4701a5ea71ae055e78490eb53b21c598;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/ftp.pp b/modules/roles/manifests/ftp.pp
index 634473cf8..95fd87d6d 100644
--- a/modules/roles/manifests/ftp.pp
+++ b/modules/roles/manifests/ftp.pp
@@ -1,5 +1,7 @@
 class roles::ftp {
 
+	include ferm::ftp_conntrack
+
 	$bind = $::hostname ? {
 		klecker => '::ffff:130.89.148.12',
 		default => '',
@@ -11,14 +13,20 @@ class roles::ftp {
 	}
 
 	vsftpd::site { 'ftp':
-		source => 'puppet:///modules/roles/ftp/vsftpd.conf',
-		bind   => $bind,
+		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 { 'security-v6':
-			source => 'puppet:///modules/roles/security_mirror/vsftpd.conf',
-			bind   => $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',
 		}
 	}
 }