Revert "s/name/title/ in a few places"

This reverts commit 64497f03874c0bbf33be7fa6287dd769cded0751.

diff --git a/modules/vsftpd/manifests/site.pp b/modules/vsftpd/manifests/site.pp
index 3f1deeb7c962a56c578ae5781bbfac416570b14e..efacf705d4dcb2a7f53baa6a17b6839c2dc347ab 100644 (file)
--- a/modules/vsftpd/manifests/site.pp
+++ b/modules/vsftpd/manifests/site.pp
@@ -35,7 +35,7 @@ class vsftpd::site (
        }
 
        # We don't need a firewall rule because it's added in vsftp.pp
-       xinetd::service { "vsftpd-${title}":
+       xinetd::service { "vsftpd-${name}":
                bind        => $bind,
                id          => $name,
                server      => '/usr/sbin/vsftpd',

diff --git a/modules/xinetd/manifests/service.pp b/modules/xinetd/manifests/service.pp
index d45e867a2feb7acb505a96c47354136d4f83d3d4..3dbc8cb072bd5da867856351d7dd7ae7e1c7fb83 100644 (file)
--- a/modules/xinetd/manifests/service.pp
+++ b/modules/xinetd/manifests/service.pp
@@ -20,17 +20,17 @@ define xinetd::service (
 
        case $ensure {
                present,absent,file: {}
-               default: { fail("Invalid ensure for '$title'") }
+               default: { fail("Invalid ensure for '$name'") }
        }
 
        if $ferm {
-               @ferm::rule { "dsa-xinetd-${title}":
+               @ferm::rule { "dsa-xinetd-${name}":
                        description => "Allow traffic to ${port}",
                        rule        => "&SERVICE(${protocol}, ${port})"
                }
        }
 
-       file { "/etc/xinetd.d/${title}.conf":
+       file { "/etc/xinetd.d/${name}.conf":
                ensure  => $ensure,
                noop    => true,
                content => template('xinetd/service.erb'),