prep for transition away from linode

[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..63f9ed6 100644 (file)
--- a/modules/vsftpd/manifests/site.pp
+++ b/modules/vsftpd/manifests/site.pp
@@ -41,19 +41,12 @@ define vsftpd::site (
                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']
 }