X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Fftp.pp;h=5823032cc730ee1a4dee22f34dda7e73f265d5fc;hb=5024ebc9b2c219d411e8a1f50fd7767d8004cb6d;hp=7895c666617c3a1664517c41f22764c9c5ceaef2;hpb=0c233c7c9bb956a834516324dd4fff08b1770f16;p=mirror%2Fdsa-puppet.git diff --git a/modules/roles/manifests/ftp.pp b/modules/roles/manifests/ftp.pp index 7895c6666..5823032cc 100644 --- a/modules/roles/manifests/ftp.pp +++ b/modules/roles/manifests/ftp.pp @@ -1,5 +1,6 @@ class roles::ftp { - include roles::archvsync_base + # this is the FTP part of the roles::debian_mirror class + include ferm::ftp_conntrack $bind = $::hostname ? { @@ -20,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',