From: Stephen Gran <steve@lobefin.net>
Date: Tue, 24 Apr 2012 20:07:04 +0000 (+0100)
Subject: fix up inheritance
X-Git-Url: https://git.donarmstrong.com/?p=dsa-puppet.git;a=commitdiff_plain;h=e8d01abc8d2ca0a3171e8691e8361367ae5d8829

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 0bf6aaf2..c55d745f 100644
--- 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 04dcb201..efacf705 100644
--- 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) {