diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/puppet/file_serving/terminus_selector.rb | 4 | ||||
| -rw-r--r-- | lib/puppet/indirector/file_content/file.rb (renamed from lib/puppet/indirector/file_content/local.rb) | 2 | ||||
| -rw-r--r-- | lib/puppet/indirector/file_metadata/file.rb (renamed from lib/puppet/indirector/file_metadata/local.rb) | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/lib/puppet/file_serving/terminus_selector.rb b/lib/puppet/file_serving/terminus_selector.rb index aa08f087e..06b53ddb1 100644 --- a/lib/puppet/file_serving/terminus_selector.rb +++ b/lib/puppet/file_serving/terminus_selector.rb @@ -9,11 +9,11 @@ require 'puppet/file_serving' # in file-serving indirections. This is necessary because # the terminus varies based on the URI asked for. module Puppet::FileServing::TerminusSelector - PROTOCOL_MAP = {"puppet" => :rest, "file" => :local, "puppetmounts" => :file_server} + PROTOCOL_MAP = {"puppet" => :rest, "file" => :file, "puppetmounts" => :file_server} # Pick an appropriate terminus based on the protocol. def select_terminus(full_uri, options = {}) - # Short-circuit to :local if it's a fully-qualified path. + # Short-circuit to :file if it's a fully-qualified path. return PROTOCOL_MAP["file"] if full_uri =~ /^#{::File::SEPARATOR}/ begin uri = URI.parse(URI.escape(full_uri)) diff --git a/lib/puppet/indirector/file_content/local.rb b/lib/puppet/indirector/file_content/file.rb index a9c45d59e..4503a7919 100644 --- a/lib/puppet/indirector/file_content/local.rb +++ b/lib/puppet/indirector/file_content/file.rb @@ -8,7 +8,7 @@ require 'puppet/util/uri_helper' require 'puppet/indirector/file_content' require 'puppet/indirector/file' -class Puppet::Indirector::FileContent::Local < Puppet::Indirector::File +class Puppet::Indirector::FileContent::File < Puppet::Indirector::File desc "Retrieve file contents from disk." include Puppet::Util::URIHelper diff --git a/lib/puppet/indirector/file_metadata/local.rb b/lib/puppet/indirector/file_metadata/file.rb index d696bc769..823c26c36 100644 --- a/lib/puppet/indirector/file_metadata/local.rb +++ b/lib/puppet/indirector/file_metadata/file.rb @@ -8,7 +8,7 @@ require 'puppet/indirector/file_metadata' require 'puppet/util/uri_helper' require 'puppet/indirector/code' -class Puppet::Indirector::FileMetadata::Local < Puppet::Indirector::Code +class Puppet::Indirector::FileMetadata::File < Puppet::Indirector::Code desc "Retrieve file metadata directly from the local filesystem." include Puppet::Util::URIHelper |