handle different binds

Signed-off-by: Stephen Gran <steve@lobefin.net>

diff --git a/modules/roles/manifests/backports_master.pp b/modules/roles/manifests/backports_master.pp
index bce2fee..507d0ff 100644 (file)
--- a/modules/roles/manifests/backports_master.pp
+++ b/modules/roles/manifests/backports_master.pp
@@ -2,7 +2,24 @@ class roles::backports_master {
 
        include roles::backports_mirror
 
+       $bind = $::hostname ? {
+               default => '',
+       }
+
+       $bind6 = $::hostname ? {
+               default => '',
+       }
+
        vsftpd::site { 'backports':
-               source => 'puppet:///modules/roles/backports_master/vsftpd.conf'
+               source => 'puppet:///modules/roles/backports_master/vsftpd.conf',
+               bind   => $bind,
        }
+
+       if $bind6 {
+               vsftpd::site { 'security-v6':
+                       source => 'puppet:///modules/roles/security_mirror/vsftpd.conf',
+                       bind   => $bind6,
+               }
+       }
+
 }

diff --git a/modules/roles/manifests/ftp.pp b/modules/roles/manifests/ftp.pp
index 27c4480..294cea3 100644 (file)
--- a/modules/roles/manifests/ftp.pp
+++ b/modules/roles/manifests/ftp.pp
@@ -1,5 +1,22 @@
 class roles::ftp {
+
+       $bind = $::hostname ? {
+               default => '',
+       }
+
+       $bind6 = $::hostname ? {
+               default => '',
+       }
+
        vsftpd::site { 'ftp':
-               source => 'puppet:///modules/roles/ftp/vsftpd.conf'
+               source => 'puppet:///modules/roles/ftp/vsftpd.conf',
+               bind   => $bind,
+       }
+
+       if $bind6 {
+               vsftpd::site { 'security-v6':
+                       source => 'puppet:///modules/roles/security_mirror/vsftpd.conf',
+                       bind   => $bind6,
+               }
        }
 }

diff --git a/modules/roles/manifests/ftp_upload.pp b/modules/roles/manifests/ftp_upload.pp
index 3bccb3d..8bdd260 100644 (file)
--- a/modules/roles/manifests/ftp_upload.pp
+++ b/modules/roles/manifests/ftp_upload.pp
@@ -1,5 +1,22 @@
 class roles::ftp_upload {
+
+       $bind = $::hostname ? {
+               default => '',
+       }
+
+       $bind6 = $::hostname ? {
+               default => '',
+       }
+
        vsftpd::site { 'ftp-upload':
-               source => 'puppet:///modules/roles/ftp_upload/vsftpd.conf'
+               source => 'puppet:///modules/roles/ftp_upload/vsftpd.conf',
+               bind   => $bind,
+       }
+
+       if $bind6 {
+               vsftpd::site { 'security-v6':
+                       source => 'puppet:///modules/roles/security_mirror/vsftpd.conf',
+                       bind   => $bind6,
+               }
        }
 }

diff --git a/modules/roles/manifests/security_mirror.pp b/modules/roles/manifests/security_mirror.pp
index 66455c9..5f59d26 100644 (file)
--- a/modules/roles/manifests/security_mirror.pp
+++ b/modules/roles/manifests/security_mirror.pp
@@ -5,7 +5,24 @@ class roles::security_mirror {
                config => 'puppet:///modules/roles/security_mirror/security.debian.org'
        }
 
+       $bind = $::hostname ? {
+               default => '',
+       }
+
+       $bind6 = $::hostname ? {
+               default => '',
+       }
+
        vsftpd::site { 'security':
-               source => 'puppet:///modules/roles/security_mirror/vsftpd.conf'
+               source => 'puppet:///modules/roles/security_mirror/vsftpd.conf',
+               bind   => $bind,
        }
+
+       if $bind6 {
+               vsftpd::site { 'security-v6':
+                       source => 'puppet:///modules/roles/security_mirror/vsftpd.conf',
+                       bind   => $bind6,
+               }
+       }
+
 }