From: Stephen Gran <steve@lobefin.net>
Date: Sat, 28 Apr 2012 14:36:01 +0000 (+0100)
Subject: roll out to klecker
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=9af7908c4701a5ea71ae055e78490eb53b21c598;p=mirror%2Fdsa-puppet.git

roll out to klecker

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

diff --git a/modules/roles/manifests/ftp.pp b/modules/roles/manifests/ftp.pp
index 294cea36d..634473cf8 100644
--- a/modules/roles/manifests/ftp.pp
+++ b/modules/roles/manifests/ftp.pp
@@ -1,10 +1,12 @@
 class roles::ftp {
 
 	$bind = $::hostname ? {
+		klecker => '::ffff:130.89.148.12',
 		default => '',
 	}
 
 	$bind6 = $::hostname ? {
+		klecker => '2001:610:1908:b000::148:12',
 		default => '',
 	}
 
diff --git a/modules/vsftpd/manifests/nolisten.pp b/modules/vsftpd/manifests/nolisten.pp
index a87356ead..64f6dc247 100644
--- a/modules/vsftpd/manifests/nolisten.pp
+++ b/modules/vsftpd/manifests/nolisten.pp
@@ -5,6 +5,7 @@ class vsftpd::nolisten inherits vsftpd {
 		franck    => false,
 		gluck     => false,
 		lobos     => false,
+		klecker   => false,
 		ravel     => false,
 		saens     => false,
 		santoro   => false,
diff --git a/modules/vsftpd/manifests/site.pp b/modules/vsftpd/manifests/site.pp
index 028f90d13..e5c93b96e 100644
--- a/modules/vsftpd/manifests/site.pp
+++ b/modules/vsftpd/manifests/site.pp
@@ -23,6 +23,7 @@ define vsftpd::site (
 		franck    => false,
 		gluck     => false,
 		lobos     => false,
+		klecker   => false,
 		ravel     => false,
 		saens     => false,
 		santoro   => false,
diff --git a/modules/xinetd/manifests/service.pp b/modules/xinetd/manifests/service.pp
index 79339f271..07a8e5851 100644
--- a/modules/xinetd/manifests/service.pp
+++ b/modules/xinetd/manifests/service.pp
@@ -23,6 +23,7 @@ define xinetd::service (
 		franck    => false,
 		gluck     => false,
 		lobos     => false,
+		klecker   => false,
 		ravel     => false,
 		saens     => false,
 		santoro   => false,