From 240645a922c1fd183e1a292d70be12bf81302227 Mon Sep 17 00:00:00 2001 From: Stephen Gran Date: Wed, 25 Apr 2012 06:24:41 +0100 Subject: [PATCH] Revert "s/name/title/ in a few places" This reverts commit 64497f03874c0bbf33be7fa6287dd769cded0751. --- modules/vsftpd/manifests/site.pp | 2 +- modules/xinetd/manifests/service.pp | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/vsftpd/manifests/site.pp b/modules/vsftpd/manifests/site.pp index 3f1deeb7..efacf705 100644 --- 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 d45e867a..3dbc8cb0 100644 --- 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'), -- 2.39.2