]> git.donarmstrong.com Git - dsa-puppet.git/commitdiff
s/name/title/ in a few places
authorStephen Gran <steve@lobefin.net>
Tue, 24 Apr 2012 20:08:46 +0000 (21:08 +0100)
committerStephen Gran <steve@lobefin.net>
Tue, 24 Apr 2012 20:08:46 +0000 (21:08 +0100)
Signed-off-by: Stephen Gran <steve@lobefin.net>
modules/vsftpd/manifests/site.pp
modules/xinetd/manifests/service.pp

index efacf705d4dcb2a7f53baa6a17b6839c2dc347ab..3f1deeb7c962a56c578ae5781bbfac416570b14e 100644 (file)
@@ -35,7 +35,7 @@ class vsftpd::site (
        }
 
        # We don't need a firewall rule because it's added in vsftp.pp
-       xinetd::service { "vsftpd-${name}":
+       xinetd::service { "vsftpd-${title}":
                bind        => $bind,
                id          => $name,
                server      => '/usr/sbin/vsftpd',
index 3dbc8cb072bd5da867856351d7dd7ae7e1c7fb83..d45e867a2feb7acb505a96c47354136d4f83d3d4 100644 (file)
@@ -20,17 +20,17 @@ define xinetd::service (
 
        case $ensure {
                present,absent,file: {}
-               default: { fail("Invalid ensure for '$name'") }
+               default: { fail("Invalid ensure for '$title'") }
        }
 
        if $ferm {
-               @ferm::rule { "dsa-xinetd-${name}":
+               @ferm::rule { "dsa-xinetd-${title}":
                        description => "Allow traffic to ${port}",
                        rule        => "&SERVICE(${protocol}, ${port})"
                }
        }
 
-       file { "/etc/xinetd.d/${name}.conf":
+       file { "/etc/xinetd.d/${title}.conf":
                ensure  => $ensure,
                noop    => true,
                content => template('xinetd/service.erb'),