X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fvsftpd%2Fmanifests%2Finit.pp;h=d59a3269a8acafd054edf734cc7e5c8500c7a2d4;hb=598ef097f4c8f6b50b61dde7fc4bd011e955b754;hp=11755b49d9c1fb6134877b35a63f4470d29ececd;hpb=bab69eec93add744d1aef693eb8055e358dc8e66;p=mirror%2Fdsa-puppet.git

diff --git a/modules/vsftpd/manifests/init.pp b/modules/vsftpd/manifests/init.pp
index 11755b49d..d59a3269a 100644
--- a/modules/vsftpd/manifests/init.pp
+++ b/modules/vsftpd/manifests/init.pp
@@ -18,17 +18,36 @@ 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_'
 	}
 
-	@ferm::rule { 'dsa-ftp':
+	ferm::rule { 'dsa-ftp':
 		domain      => '(ip ip6)',
 		description => 'Allow ftp access',
 		rule        => '&SERVICE(tcp, 21)',
 	}
 
+	file { '/srv/ftp':
+		ensure => directory,
+		mode   => '0755'
+	}
 	file { '/var/log/ftp':
 		ensure => directory,
 		mode   => '0755'
@@ -40,5 +59,4 @@ class vsftpd {
 			Package['debian.org']
 		]
 	}
-
 }