Merge remote-tracking branch 'waldi/vsftpd-systemd-upload'

[mirror/dsa-puppet.git] / modules / roles / manifests / ftp.pp

diff --git a/modules/roles/manifests/ftp.pp b/modules/roles/manifests/ftp.pp
index a7870cb..5823032 100644 (file)
--- a/modules/roles/manifests/ftp.pp
+++ b/modules/roles/manifests/ftp.pp
@@ -1,7 +1,6 @@
 class roles::ftp {
        # this is the FTP part of the roles::debian_mirror class
 
-       include roles::archvsync_base
        include ferm::ftp_conntrack
 
        $bind = $::hostname ? {
@@ -22,7 +21,7 @@ class roles::ftp {
                root         => '/srv/ftp.debian.org/ftp.root',
        }
 
-       if $bind6 {
+       if $bind6 != '' {
                vsftpd::site { 'ftp-v6':
                        banner       => 'ftp.debian.org FTP server',
                        logfile      => '/var/log/ftp/vsftpd-ftp.debian.org.log',