roll out to klecker

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

diff --git a/modules/roles/manifests/ftp.pp b/modules/roles/manifests/ftp.pp
index 27c4480b1ac60bd7d71105573adfc98dc139b39c..634473cf8586416f6605f3081fb597cf0013a930 100644 (file)
--- a/modules/roles/manifests/ftp.pp
+++ b/modules/roles/manifests/ftp.pp
@@ -1,5 +1,24 @@
 class roles::ftp {
+
+       $bind = $::hostname ? {
+               klecker => '::ffff:130.89.148.12',
+               default => '',
+       }
+
+       $bind6 = $::hostname ? {
+               klecker => '2001:610:1908:b000::148:12',
+               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,
+               }
        }
 }