From 3cab052371737d529a2898605ab36c830f80848a Mon Sep 17 00:00:00 2001 From: Stephen Gran Date: Wed, 25 Apr 2012 06:26:25 +0100 Subject: [PATCH] er, that's the real issue Signed-off-by: Stephen Gran --- modules/roles/manifests/backports_master.pp | 2 +- modules/roles/manifests/security_mirror.pp | 2 +- modules/vsftpd/manifests/site.pp | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/modules/roles/manifests/backports_master.pp b/modules/roles/manifests/backports_master.pp index dcb2af47..bce2fee2 100644 --- a/modules/roles/manifests/backports_master.pp +++ b/modules/roles/manifests/backports_master.pp @@ -2,7 +2,7 @@ class roles::backports_master { include roles::backports_mirror - class { 'vsftpd::site': + vsftpd::site { 'backports': source => 'puppet:///modules/roles/backports_master/vsftpd.conf' } } diff --git a/modules/roles/manifests/security_mirror.pp b/modules/roles/manifests/security_mirror.pp index 9b9ec2d2..66455c99 100644 --- a/modules/roles/manifests/security_mirror.pp +++ b/modules/roles/manifests/security_mirror.pp @@ -5,7 +5,7 @@ class roles::security_mirror { config => 'puppet:///modules/roles/security_mirror/security.debian.org' } - class { 'vsftpd::site': + vsftpd::site { 'security': source => 'puppet:///modules/roles/security_mirror/vsftpd.conf' } } diff --git a/modules/vsftpd/manifests/site.pp b/modules/vsftpd/manifests/site.pp index efacf705..26541cc0 100644 --- a/modules/vsftpd/manifests/site.pp +++ b/modules/vsftpd/manifests/site.pp @@ -1,4 +1,5 @@ -class vsftpd::site ( +define vsftpd::site ( + $name, $source='', $content='', $bind=$::ipaddress, -- 2.39.2