Drop xinetd support in rsync

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

diff --git a/modules/vsftpd/manifests/site.pp b/modules/vsftpd/manifests/site.pp
index 9cdacde..98cca97 100644 (file)
--- a/modules/vsftpd/manifests/site.pp
+++ b/modules/vsftpd/manifests/site.pp
@@ -3,6 +3,7 @@ define vsftpd::site (
        $bind='',
        $chown_user='',
        $writable=false,
+       $writable_other=false,
        $banner="${name} FTP Server",
        $max_clients=100,
        $logfile="/var/log/ftp/vsftpd-${name}.debian.org.log",
@@ -30,30 +31,26 @@ define vsftpd::site (
        }
 
        munin::check { "vsftpd-${name}":
+               ensure => $ensure,
                script => 'vsftpd'
        }
        munin::conf { "vsftpd-${name}":
+               ensure  => $ensure,
                content => template('vsftpd/munin.erb')
        }
 
        # We don't need a firewall rule because it's added in vsftp.pp
        xinetd::service { "vsftpd-${name}":
+               ensure      => $ensure,
                bind        => $bind,
                id          => "${name}-ftp",
                server      => '/usr/sbin/vsftpd',
-               port        => 'ftp',
+               service     => 'ftp',
                server_args => $fname,
                ferm        => false,
                instances   => $max_clients,
                require     => File[$fname]
        }
 
-       # 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'],
-       }
-
        Service['vsftpd']->Service['xinetd']
 }