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

diff --git a/modules/vsftpd/manifests/site_systemd.pp b/modules/vsftpd/manifests/site_systemd.pp
index 789c5665e..27a75be2d 100644
--- a/modules/vsftpd/manifests/site_systemd.pp
+++ b/modules/vsftpd/manifests/site_systemd.pp
@@ -72,20 +72,10 @@ define vsftpd::site_systemd (
 			Exec['systemctl daemon-reload'],
 			File["/etc/systemd/system/vsftpd-${name}@.service"],
 			File["/etc/systemd/system/vsftpd-${name}.socket"],
-			Service['xinetd'],
 		],
 		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'