er, that's the real issue

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

diff --git a/modules/roles/manifests/backports_master.pp b/modules/roles/manifests/backports_master.pp
index dcb2af47291e45247b0ee4fbd3d103c5f528565c..bce2fee27516e827eaa9a57a0be90ee81b3a40e8 100644 (file)
--- 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 9b9ec2d2fa1157d06a67dd60fe23034ef51e3039..66455c991f258d2487411eb367dce82f78bd9a19 100644 (file)
--- 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 efacf705d4dcb2a7f53baa6a17b6839c2dc347ab..26541cc01aeda0c8ebd1e9b46bffcbfcff3ffa90 100644 (file)
--- 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,