fix up inheritance

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

diff --git a/modules/vsftpd/manifests/nolisten.pp b/modules/vsftpd/manifests/nolisten.pp
index 0bf6aaf2e09ad6ee276c6409cffb03c63bae7cb4..c55d745faeba7fb6be99d302b44d59dd58d91c9b 100644 (file)
--- a/modules/vsftpd/manifests/nolisten.pp
+++ b/modules/vsftpd/manifests/nolisten.pp
@@ -1,4 +1,4 @@
-class vsftpd::nolisten {
+class vsftpd::nolisten inherits vsftpd {
 
        Service['vsftpd'] {
                ensure => stopped,

diff --git a/modules/vsftpd/manifests/site.pp b/modules/vsftpd/manifests/site.pp
index 04dcb20106e1e09585f6686bd879299d5ecd225b..efacf705d4dcb2a7f53baa6a17b6839c2dc347ab 100644 (file)
--- a/modules/vsftpd/manifests/site.pp
+++ b/modules/vsftpd/manifests/site.pp
@@ -5,7 +5,6 @@ class vsftpd::site (
        $ensure=present
 ){
 
-       include vsftpd
        include vsftpd::nolisten
 
        if ($source and $content) {