diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/puppet/file_serving/configuration.rb | 2 | ||||
| -rw-r--r-- | lib/puppet/indirector/file_server.rb | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/puppet/file_serving/configuration.rb b/lib/puppet/file_serving/configuration.rb index cb6cc3634..6f36d2750 100644 --- a/lib/puppet/file_serving/configuration.rb +++ b/lib/puppet/file_serving/configuration.rb @@ -72,7 +72,7 @@ class Puppet::FileServing::Configuration raise(ArgumentError, "Cannot find file: Invalid path '%s'" % mount_name) unless mount_name =~ %r{^[-\w]+$} - return nil unless mount = find_mount(mount_name, request.options[:node]) + return nil unless mount = find_mount(mount_name, request.node) if mount.name == "modules" and mount_name != "modules" # yay backward-compatibility path = "%s/%s" % [mount_name, path] diff --git a/lib/puppet/indirector/file_server.rb b/lib/puppet/indirector/file_server.rb index e3bde1540..5fe744a0e 100644 --- a/lib/puppet/indirector/file_server.rb +++ b/lib/puppet/indirector/file_server.rb @@ -19,7 +19,7 @@ class Puppet::Indirector::FileServer < Puppet::Indirector::Terminus # If we're not serving this mount, then access is denied. return false unless mount - return mount.allowed?(request.options[:node], request.options[:ipaddress]) + return mount.allowed?(request.node, request.ip) end # Find our key using the fileserver. @@ -30,7 +30,7 @@ class Puppet::Indirector::FileServer < Puppet::Indirector::Terminus # The mount checks to see if the file exists, and returns nil # if not. - return nil unless path = mount.find(relative_path, request.options) + return nil unless path = mount.find(relative_path, :node => request.node) result = model.new(path) result.links = request.options[:links] if request.options[:links] result.collect |