X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Fftp.pp;h=452c4597c4a1bfa53a782138c8a6023fabca7406;hb=a33c8b8a15ffe1c49f19863ca671bf76cdeb80f4;hp=712a597d9bf52b53a8e7267988e4a71b5d3fb5d9;hpb=1d4dd6ac681d38818f71dd2aecda0562a32dfca2;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/ftp.pp b/modules/roles/manifests/ftp.pp
index 712a597d9..452c4597c 100644
--- a/modules/roles/manifests/ftp.pp
+++ b/modules/roles/manifests/ftp.pp
@@ -1,14 +1,12 @@
 class roles::ftp {
 	# this is the FTP part of the roles::debian_mirror class
 
-	include ferm::ftp_conntrack
-
 	$binds = $::hostname ? {
 		klecker => [ '130.89.148.12', '[2001:610:1908:b000::148:12]' ],
 		default => [ '[::]' ],
 	}
 
-	vsftpd::site_systemd { 'ftp':
+	vsftpd::site { 'ftp':
 		banner       => 'ftp.debian.org FTP server',
 		logfile      => '/var/log/ftp/vsftpd-ftp.debian.org.log',
 		binds        => $binds,