From: Paul Wise <pabs@debian.org>
Date: Thu, 18 Jun 2015 06:01:16 +0000 (+0800)
Subject: Ensure the /var/run/vsftpd/empty exists as vsftpd is broken without it
X-Git-Url: https://git.donarmstrong.com/?p=dsa-puppet.git;a=commitdiff_plain;h=c0a4c322a144dd2871838157142a78dd7585bf52

Ensure the /var/run/vsftpd/empty exists as vsftpd is broken without it

This is a workaround for vsftpd not including this file (#789127)
---

diff --git a/modules/vsftpd/manifests/init.pp b/modules/vsftpd/manifests/init.pp
index 876e8654..0ad87bad 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