diff options
| author | Jesse Wolfe <jes5199@gmail.com> | 2010-08-27 12:33:15 -0700 |
|---|---|---|
| committer | Jesse Wolfe <jes5199@gmail.com> | 2010-08-27 12:33:15 -0700 |
| commit | fb9034731ddae41f1009745eb8eb1ea53aa05cfb (patch) | |
| tree | 5cb8296af8859f59b9a20995105af77a9cdb2821 /lib/puppet/file_serving/indirection_hooks.rb | |
| parent | 16f701edd89a320ad73b5468d883dfb017fe6e96 (diff) | |
| parent | 8be1929043f4560bb17a4b06293b3f9a4efcfdbf (diff) | |
| download | puppet-fb9034731ddae41f1009745eb8eb1ea53aa05cfb.tar.gz puppet-fb9034731ddae41f1009745eb8eb1ea53aa05cfb.tar.xz puppet-fb9034731ddae41f1009745eb8eb1ea53aa05cfb.zip | |
Merge commit '2.6.1rc3' into next
Diffstat (limited to 'lib/puppet/file_serving/indirection_hooks.rb')
| -rw-r--r-- | lib/puppet/file_serving/indirection_hooks.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/puppet/file_serving/indirection_hooks.rb b/lib/puppet/file_serving/indirection_hooks.rb index 7e0c17916..a85e90ef1 100644 --- a/lib/puppet/file_serving/indirection_hooks.rb +++ b/lib/puppet/file_serving/indirection_hooks.rb @@ -19,8 +19,8 @@ module Puppet::FileServing::IndirectionHooks return PROTOCOL_MAP["file"] if request.key =~ /^#{::File::SEPARATOR}/ return PROTOCOL_MAP["file"] if request.protocol == "file" - # We're heading over the wire the protocol is 'puppet' and we've got a server name or we're not named 'puppet' - if request.protocol == "puppet" and (request.server or Puppet.settings[:name] != "puppet") + # We're heading over the wire the protocol is 'puppet' and we've got a server name or we're not named 'apply' or 'puppet' + if request.protocol == "puppet" and (request.server or !["puppet","apply"].include?(Puppet.settings[:name])) return PROTOCOL_MAP["puppet"] end |