From 96b5087d4e8e6eb8e95f6dfab44163b486e1fd86 Mon Sep 17 00:00:00 2001 From: Markus Roberts Date: Thu, 17 Sep 2009 18:56:56 -0700 Subject: Fix for ticket #2639 (Puppet[:user]/Puppet[:group] vs. 'service') Internally the service user & group should only be referenced by the place-holder string 'service' which is replaced with the actual user or group as needed at the puppet/OS border. This patch corrects to places in reports where Puppet[:user] and Puupet[:group] were being used instead. Signed-off-by: Markus Roberts --- lib/puppet/reports/rrdgraph.rb | 2 +- lib/puppet/reports/store.rb | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'lib') diff --git a/lib/puppet/reports/rrdgraph.rb b/lib/puppet/reports/rrdgraph.rb index 0c1cbf202..3e2eeb7a6 100644 --- a/lib/puppet/reports/rrdgraph.rb +++ b/lib/puppet/reports/rrdgraph.rb @@ -104,7 +104,7 @@ Puppet::Reports.register_report(:rrdgraph) do unless File.directory?(hostdir) and FileTest.writable?(hostdir) # Some hackishness to create the dir with all of the right modes and ownership config = Puppet::Util::Settings.new - config.setdefaults(:reports, :hostdir => {:default => hostdir, :owner => Puppet[:user], :mode => 0755, :group => Puppet[:group], :desc => "eh"}) + config.setdefaults(:reports, :hostdir => {:default => hostdir, :owner => 'service', :mode => 0755, :group => 'service', :desc => "eh"}) # This creates the dir. config.use(:reports) diff --git a/lib/puppet/reports/store.rb b/lib/puppet/reports/store.rb index 720e78cea..04eff82f9 100644 --- a/lib/puppet/reports/store.rb +++ b/lib/puppet/reports/store.rb @@ -16,8 +16,8 @@ Puppet::Reports.register_report(:store) do "client-#{client}-dir" => { :default => dir, :mode => 0750, :desc => "Client dir for %s" % client, - :owner => Puppet[:user], - :group => Puppet[:group] + :owner => 'service', + :group => 'service' } ) -- cgit