diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/puppet/util/settings.rb | 1 | ||||
| -rw-r--r-- | lib/puppet/util/settings/file_setting.rb | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/lib/puppet/util/settings.rb b/lib/puppet/util/settings.rb index 002bc0b1a..f859dac62 100644 --- a/lib/puppet/util/settings.rb +++ b/lib/puppet/util/settings.rb @@ -380,6 +380,7 @@ class Puppet::Util::Settings # because multiple sections could set the same value # and I'm too lazy to only set the metadata once. searchpath.reverse.each do |source| + source = @name if (@name && source == :name) if meta = @values[source][:_meta] set_metadata(meta) end diff --git a/lib/puppet/util/settings/file_setting.rb b/lib/puppet/util/settings/file_setting.rb index 2dfbcf46e..e8cebaf33 100644 --- a/lib/puppet/util/settings/file_setting.rb +++ b/lib/puppet/util/settings/file_setting.rb @@ -3,7 +3,7 @@ require 'puppet/util/settings/setting' # A file. class Puppet::Util::Settings::FileSetting < Puppet::Util::Settings::Setting AllowedOwners = %w{root service} - AllowedGroups = %w{service} + AllowedGroups = %w{root service} class SettingError < StandardError; end |