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

[dsa-puppet.git] / modules / vsftpd / manifests / init.pp

diff --git a/modules/vsftpd/manifests/init.pp b/modules/vsftpd/manifests/init.pp
index 7f0be8fc83455f9557916d254c3c18bb47959cd5..0ad87bad2f95232cbf403d443ab0dc9953e9412d 100644 (file)
--- a/modules/vsftpd/manifests/init.pp
+++ b/modules/vsftpd/manifests/init.pp
@@ -18,6 +18,19 @@ class vsftpd {
                notify  => Service['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
        }
@@ -42,5 +55,4 @@ class vsftpd {
                        Package['debian.org']
                ]
        }
-
 }