X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fvsftpd%2Fmanifests%2Finit.pp;h=9806604f525977aa232f1f7ad2924c63074499b1;hb=a001db15a8463b3aac135b05343aca2ac7dc2aa9;hp=531594fc4db09a94e7d10f3ea84d51b09698b528;hpb=a691c72453f8511a9711e63059aa2991ad0459d6;p=mirror%2Fdsa-puppet.git

diff --git a/modules/vsftpd/manifests/init.pp b/modules/vsftpd/manifests/init.pp
index 531594fc4..9806604f5 100644
--- a/modules/vsftpd/manifests/init.pp
+++ b/modules/vsftpd/manifests/init.pp
@@ -18,7 +18,22 @@ class vsftpd {
 		notify  => Service['vsftpd']
 	}
 
-	munin::check { 'vsftpd': }
+	# 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'],
+	}
+
+	# Ensure the empty dir is present, workaround for #789127
+	file { '/etc/tmpfiles.d/vsftpd.conf':
+		content => 'd /var/run/vsftpd/empty 0755 root root -',
+		notify => Exec['systemd-tmpfiles --create --exclude-prefix=/dev'],
+	}
+
+	munin::check { 'vsftpd':
+		ensure => absent
+	}
 	munin::check { 'ps_vsftpd':
 		script => 'ps_'
 	}
@@ -37,8 +52,7 @@ class vsftpd {
 		source  => 'puppet:///modules/vsftpd/logrotate.conf',
 		require => [
 			Package['vsftpd'],
-			Package['debian-org']
+			Package['debian.org']
 		]
 	}
-
 }