X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fvsftpd%2Fmanifests%2Fsite.pp;h=63f9ed67b5c1ad1b11d4acd912c220a6ba26b787;hb=67db5724b6dd3c1e629dfe0be5db20821ffcc0f7;hp=46c805edb7121b35bd2a23f2286dc1bea821da6c;hpb=2e543336735a47031e835f32ee49351ad84eea45;p=mirror%2Fdsa-puppet.git

diff --git a/modules/vsftpd/manifests/site.pp b/modules/vsftpd/manifests/site.pp
index 46c805edb..63f9ed67b 100644
--- a/modules/vsftpd/manifests/site.pp
+++ b/modules/vsftpd/manifests/site.pp
@@ -29,12 +29,19 @@ define vsftpd::site (
 		ensure => absent
 	}
 
+	munin::check { "vsftpd-${name}":
+		script => 'vsftpd'
+	}
+	munin::conf { "vsftpd-${name}":
+		content => template('vsftpd/munin.erb')
+	}
+
 	# We don't need a firewall rule because it's added in vsftp.pp
 	xinetd::service { "vsftpd-${name}":
 		bind        => $bind,
 		id          => "${name}-ftp",
 		server      => '/usr/sbin/vsftpd',
-		port        => 'ftp',
+		service     => 'ftp',
 		server_args => $fname,
 		ferm        => false,
 		instances   => $max_clients,