if we do not have specific binds, we use the empty string to signal that

diff --git a/modules/roles/manifests/ftp.pp b/modules/roles/manifests/ftp.pp
index bdb9f4b..5823032 100644 (file)
--- a/modules/roles/manifests/ftp.pp
+++ b/modules/roles/manifests/ftp.pp
@@ -21,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',

diff --git a/modules/roles/manifests/ftp_upload.pp b/modules/roles/manifests/ftp_upload.pp
index 5612606..b553b70 100644 (file)
--- a/modules/roles/manifests/ftp_upload.pp
+++ b/modules/roles/manifests/ftp_upload.pp
@@ -10,7 +10,7 @@ class roles::ftp_upload {
                root       => '/srv/upload.debian.org/ftp',
        }
 
-       if $bind6 {
+       if $bind6 != '' {
                vsftpd::site { 'ftp-upload-v6':
                        banner     => 'ftp.upload.debian.org FTP server',
                        logfile    => '/var/log/ftp/vsftpd-ftp.upload.debian.org.log',

diff --git a/modules/roles/manifests/ports_master.pp b/modules/roles/manifests/ports_master.pp
index d714d7c..fa7099a 100644 (file)
--- a/modules/roles/manifests/ports_master.pp
+++ b/modules/roles/manifests/ports_master.pp
@@ -20,7 +20,7 @@ class roles::ports_master {
                root           => '/srv/ports-master.debian.org/ftp.upload',
        }
 
-       if $bind6 {
+       if $bind6 != '' {
                vsftpd::site { 'ports-master-v6':
                        banner         => 'ports-master.debian.org FTP server',
                        logfile        => '/var/log/ftp/vsftpd-ports-master.debian.org.log',

diff --git a/modules/roles/manifests/security_mirror.pp b/modules/roles/manifests/security_mirror.pp
index 1cda924..d135ffe 100644 (file)
--- a/modules/roles/manifests/security_mirror.pp
+++ b/modules/roles/manifests/security_mirror.pp
@@ -48,7 +48,7 @@ class roles::security_mirror {
                        root         => '/srv/ftp.root/',
                        bind         => $ftp_bind,
                }
-               if ($ftp_bind6) {
+               if ($ftp_bind6 != '') {
                        vsftpd::site { 'security6':
                                banner       => 'security.debian.org FTP server (vsftpd)',
                                logfile      => '/var/log/ftp/vsftpd-security6.debian.org.log',