From: Stephen Gran <steve@lobefin.net>
Date: Wed, 2 May 2012 07:18:03 +0000 (+0100)
Subject: all vsftpd is now from xinetd
X-Git-Url: https://git.donarmstrong.com/?p=dsa-puppet.git;a=commitdiff_plain;h=fc12446d1c57ce8ffc3546f9a58c8e6f9cca404a

all vsftpd is now from xinetd

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

diff --git a/modules/vsftpd/manifests/init.pp b/modules/vsftpd/manifests/init.pp
index 451706e1..2e099d79 100644
--- a/modules/vsftpd/manifests/init.pp
+++ b/modules/vsftpd/manifests/init.pp
@@ -8,10 +8,16 @@ class vsftpd {
 	}
 
 	service { 'vsftpd':
-		ensure  => running,
+		ensure  => stopped,
 		require => Package['vsftpd']
 	}
 
+	file { '/etc/vsftpd.conf':
+		content => "listen=NO\n",
+		require => Package['vsftpd'],
+		notify  => Service['vsftpd']
+	}
+
 	munin::check { 'vsftpd': }
 	munin::check { 'ps_vsftpd':
 		script => 'ps_'
diff --git a/modules/vsftpd/manifests/nolisten.pp b/modules/vsftpd/manifests/nolisten.pp
deleted file mode 100644
index 78fcd008..00000000
--- a/modules/vsftpd/manifests/nolisten.pp
+++ /dev/null
@@ -1,13 +0,0 @@
-class vsftpd::nolisten inherits vsftpd {
-
-	Service['vsftpd'] {
-		ensure => stopped,
-	}
-
-	Service['vsftpd']->Service['xinetd']
-
-	file { '/etc/vsftpd.conf':
-		content => "listen=NO\n",
-		notify  => Service['vsftpd']
-	}
-}
diff --git a/modules/vsftpd/manifests/site.pp b/modules/vsftpd/manifests/site.pp
index 338a5927..fc941f3b 100644
--- a/modules/vsftpd/manifests/site.pp
+++ b/modules/vsftpd/manifests/site.pp
@@ -9,7 +9,7 @@ define vsftpd::site (
 	$ensure=present
 ){
 
-	include vsftpd::nolisten
+	include vsftpd
 
 	case $ensure {
 		present,absent: {}
@@ -40,4 +40,5 @@ define vsftpd::site (
 		require     => File[$fname]
 	}
 
+	Service['vsftpd']->Service['xinetd']
 }