X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fvsftpd%2Fmanifests%2Fsite_systemd.pp;h=27a75be2d453be6e35b3de5cec5a2321345f943f;hb=46efb1d7284108553bc312019338f574a940030e;hp=ced51d49febf1a8db196306ac60c39ab0e1f506e;hpb=cbbf3d951acc209b7db47940b2b49f205f3e5650;p=mirror%2Fdsa-puppet.git

diff --git a/modules/vsftpd/manifests/site_systemd.pp b/modules/vsftpd/manifests/site_systemd.pp
index ced51d49f..27a75be2d 100644
--- a/modules/vsftpd/manifests/site_systemd.pp
+++ b/modules/vsftpd/manifests/site_systemd.pp
@@ -10,6 +10,7 @@ define vsftpd::site_systemd (
 	$ensure=present,
 ) {
 	include vsftpd
+	include ferm::ftp_conntrack
 
 	case $ensure {
 		present,absent: {}
@@ -26,6 +27,8 @@ define vsftpd::site_systemd (
 		absent  => false,
 	}
 
+	$ftpsite = $name
+
 	$fname = "/etc/vsftpd-${name}.conf"
 
 	file { $fname:
@@ -73,15 +76,6 @@ define vsftpd::site_systemd (
 		provider => systemd,
 	}
 
-	xinetd::service { [ "vsftpd-${name}", "vsftpd-${name}6", "vsftpd-${name}-v6" ]:
-		ensure  => absent,
-		id      => 'unused',
-		server  => 'unused',
-		service => 'unused',
-		ferm    => false,
-		before  => Service["vsftpd-${name}.socket"],
-	}
-
 	munin::check { "vsftpd-${name}":
 		ensure => $ensure,
 		script => 'vsftpd'