X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fvsftpd%2Fmanifests%2Fsite.pp;h=98cca97764bd1ac5b11d2316783df6324fb943ad;hb=9f88565cb9882258e5033b3c349a50f9732eecbd;hp=9cdacde0d049c69a597e4129186ebe71452ee0ce;hpb=7ab0c30ced4a46e9f63333eb0043852fed517c1a;p=mirror%2Fdsa-puppet.git

diff --git a/modules/vsftpd/manifests/site.pp b/modules/vsftpd/manifests/site.pp
index 9cdacde0d..98cca9776 100644
--- a/modules/vsftpd/manifests/site.pp
+++ b/modules/vsftpd/manifests/site.pp
@@ -3,6 +3,7 @@ define vsftpd::site (
 	$bind='',
 	$chown_user='',
 	$writable=false,
+	$writable_other=false,
 	$banner="${name} FTP Server",
 	$max_clients=100,
 	$logfile="/var/log/ftp/vsftpd-${name}.debian.org.log",
@@ -30,30 +31,26 @@ define vsftpd::site (
 	}
 
 	munin::check { "vsftpd-${name}":
+		ensure => $ensure,
 		script => 'vsftpd'
 	}
 	munin::conf { "vsftpd-${name}":
+		ensure  => $ensure,
 		content => template('vsftpd/munin.erb')
 	}
 
 	# We don't need a firewall rule because it's added in vsftp.pp
 	xinetd::service { "vsftpd-${name}":
+		ensure      => $ensure,
 		bind        => $bind,
 		id          => "${name}-ftp",
 		server      => '/usr/sbin/vsftpd',
-		port        => 'ftp',
+		service     => 'ftp',
 		server_args => $fname,
 		ferm        => false,
 		instances   => $max_clients,
 		require     => File[$fname]
 	}
 
-	# Mask the vsftpd service as we are using xinetd
-	file { '/etc/systemd/system/vsftpd.service':
-		ensure => 'link',
-		target => '/dev/null',
-		notify => Exec['systemctl daemon-reload'],
-	}
-
 	Service['vsftpd']->Service['xinetd']
 }