Also collect entries that only knew the port

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

diff --git a/modules/vsftpd/manifests/init.pp b/modules/vsftpd/manifests/init.pp
index 876e865..d59a326 100644 (file)
--- 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'