X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fvsftpd%2Fmanifests%2Fsite.pp;h=4adb08a9dabc7e4d9572692202783001a1b7015e;hb=23f5b3083f20cf6e8803dabbae30c9acc626ae3b;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..4adb08a9d 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",
@@ -41,19 +42,12 @@ define vsftpd::site (
 		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']
 }