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

diff --git a/modules/vsftpd/manifests/init.pp b/modules/vsftpd/manifests/init.pp
index 876e8654b..d59a3269a 100644
--- a/modules/vsftpd/manifests/init.pp
+++ b/modules/vsftpd/manifests/init.pp
@@ -25,6 +25,11 @@ class vsftpd {
 		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
@@ -33,12 +38,16 @@ class 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'