summaryrefslogtreecommitdiffstats
path: root/lib/puppet
diff options
context:
space:
mode:
Diffstat (limited to 'lib/puppet')
-rw-r--r--lib/puppet/file_serving/content.rb4
-rw-r--r--lib/puppet/file_serving/indirection_hooks.rb (renamed from lib/puppet/file_serving/terminus_selector.rb)2
-rw-r--r--lib/puppet/file_serving/metadata.rb4
3 files changed, 5 insertions, 5 deletions
diff --git a/lib/puppet/file_serving/content.rb b/lib/puppet/file_serving/content.rb
index 3cb428e63..063192d15 100644
--- a/lib/puppet/file_serving/content.rb
+++ b/lib/puppet/file_serving/content.rb
@@ -5,14 +5,14 @@
require 'puppet/indirector'
require 'puppet/file_serving'
require 'puppet/file_serving/file_base'
-require 'puppet/file_serving/terminus_selector'
+require 'puppet/file_serving/indirection_hooks'
# A class that handles retrieving file contents.
# It only reads the file when its content is specifically
# asked for.
class Puppet::FileServing::Content < Puppet::FileServing::FileBase
extend Puppet::Indirector
- indirects :file_content, :extend => Puppet::FileServing::TerminusSelector
+ indirects :file_content, :extend => Puppet::FileServing::IndirectionHooks
attr_reader :path
diff --git a/lib/puppet/file_serving/terminus_selector.rb b/lib/puppet/file_serving/indirection_hooks.rb
index 06b53ddb1..141642efe 100644
--- a/lib/puppet/file_serving/terminus_selector.rb
+++ b/lib/puppet/file_serving/indirection_hooks.rb
@@ -8,7 +8,7 @@ require 'puppet/file_serving'
# This module is used to pick the appropriate terminus
# in file-serving indirections. This is necessary because
# the terminus varies based on the URI asked for.
-module Puppet::FileServing::TerminusSelector
+module Puppet::FileServing::IndirectionHooks
PROTOCOL_MAP = {"puppet" => :rest, "file" => :file, "puppetmounts" => :file_server}
# Pick an appropriate terminus based on the protocol.
diff --git a/lib/puppet/file_serving/metadata.rb b/lib/puppet/file_serving/metadata.rb
index 62ebccca9..410655731 100644
--- a/lib/puppet/file_serving/metadata.rb
+++ b/lib/puppet/file_serving/metadata.rb
@@ -7,14 +7,14 @@ require 'puppet/indirector'
require 'puppet/file_serving'
require 'puppet/file_serving/file_base'
require 'puppet/util/checksums'
-require 'puppet/file_serving/terminus_selector'
+require 'puppet/file_serving/indirection_hooks'
# A class that handles retrieving file metadata.
class Puppet::FileServing::Metadata < Puppet::FileServing::FileBase
include Puppet::Util::Checksums
extend Puppet::Indirector
- indirects :file_metadata, :extend => Puppet::FileServing::TerminusSelector
+ indirects :file_metadata, :extend => Puppet::FileServing::IndirectionHooks
attr_reader :path, :owner, :group, :mode, :checksum_type, :checksum, :ftype, :destination