X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=inline;f=modules%2Fvsftpd%2Fmanifests%2Fsite.pp;h=2087839a897bdf833592fdfe3e634d572854ae56;hb=63b71c4dc6db113302d78f26928e6f4dbd04aa55;hp=8a6f5b505a13984bdcd22c2c20caa298fa27791b;hpb=babbf8a33c505679abad4bd1837037751c98b926;p=mirror%2Fdsa-puppet.git

diff --git a/modules/vsftpd/manifests/site.pp b/modules/vsftpd/manifests/site.pp
index 8a6f5b505..2087839a8 100644
--- a/modules/vsftpd/manifests/site.pp
+++ b/modules/vsftpd/manifests/site.pp
@@ -1,7 +1,7 @@
 define vsftpd::site (
 	$source='',
 	$content='',
-	$bind=$::ipaddress,
+	$bind='',
 	$ensure=present
 ){
 
@@ -18,16 +18,22 @@ define vsftpd::site (
 
 	$fname = "/etc/vsftpd-${name}.conf"
 
+	$noop = $::hostname ? {
+		villa   => false,
+		lobos   => false,
+		default => true
+	}
+
 	if $source {
 		file { $fname:
 			ensure => $ensure,
-			noop   => true,
+			noop   => $noop,
 			source => $source,
 		}
 	} elsif $content {
 		file { $fname:
 			ensure  => $ensure,
-			noop    => true,
+			noop    => $noop,
 			content => $content,
 		}
 	} else {
@@ -37,7 +43,7 @@ define vsftpd::site (
 	# We don't need a firewall rule because it's added in vsftp.pp
 	xinetd::service { "vsftpd-${name}":
 		bind        => $bind,
-		id          => $name,
+		id          => "${name}-ftp",
 		server      => '/usr/sbin/vsftpd',
 		port        => 'ftp',
 		server_args => $fname,