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

diff --git a/modules/vsftpd/manifests/init.pp b/modules/vsftpd/manifests/init.pp
index d664b7e0d..9806604f5 100644
--- a/modules/vsftpd/manifests/init.pp
+++ b/modules/vsftpd/manifests/init.pp
@@ -18,7 +18,20 @@ class vsftpd {
 		notify  => Service['vsftpd']
 	}
 
-	munin::check { "vsftpd-${name}":
+	# 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':
@@ -42,5 +55,4 @@ class vsftpd {
 			Package['debian.org']
 		]
 	}
-
 }