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 451706e193f189e347b5c9c615438892aacf9945..2e099d79af66475a287eabd2e1b7f61d200fd172 100644 (file)
--- 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 (file)
index 78fcd00..0000000
--- 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 338a59274b44706f9a65915dd0f89af2bb9e5529..fc941f3b3a8d97d390d6ff0ac9061742a7c4fe5d 100644 (file)
--- 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']
 }