X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fvsftpd%2Fmanifests%2Fsite.pp;h=d89d7a2f75c84adbb6e02ff4a4925638b42b87a8;hb=45e86ea20c646cf8c4589cddfb0e56eb3f954d0d;hp=04dcb20106e1e09585f6686bd879299d5ecd225b;hpb=14939bab78c7c6231e7b13a5b0e655e934b456f0;p=mirror%2Fdsa-puppet.git

diff --git a/modules/vsftpd/manifests/site.pp b/modules/vsftpd/manifests/site.pp
index 04dcb2010..d89d7a2f7 100644
--- a/modules/vsftpd/manifests/site.pp
+++ b/modules/vsftpd/manifests/site.pp
@@ -1,11 +1,10 @@
-class vsftpd::site (
+define vsftpd::site (
 	$source='',
 	$content='',
-	$bind=$::ipaddress,
+	$bind='',
 	$ensure=present
 ){
 
-	include vsftpd
 	include vsftpd::nolisten
 
 	if ($source and $content) {
@@ -19,16 +18,29 @@ class vsftpd::site (
 
 	$fname = "/etc/vsftpd-${name}.conf"
 
+	$noop = $::hostname ? {
+		gluck     => false,
+		lobos     => false,
+		saens     => false,
+		santoro   => false,
+		schein    => false,
+		steffani  => false,
+		villa     => false,
+		wieck     => false,
+		morricone => 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 {
@@ -38,11 +50,12 @@ class 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,
 		ferm        => false,
+		require     => File[$fname]
 	}
 
 }