diff options
| author | Luke Kanies <luke@madstop.com> | 2007-10-18 14:43:08 -0500 |
|---|---|---|
| committer | Luke Kanies <luke@madstop.com> | 2007-10-18 14:43:08 -0500 |
| commit | 64c6700bc7530f1213e124d248cc176a7cfe6180 (patch) | |
| tree | 4b51cfb3ddc6cc3d9818d971771a306e1865f4d8 /lib | |
| parent | 56b83fe1bd1b08ccd3cc8a857e3a993790d2a983 (diff) | |
| download | puppet-64c6700bc7530f1213e124d248cc176a7cfe6180.tar.gz puppet-64c6700bc7530f1213e124d248cc176a7cfe6180.tar.xz puppet-64c6700bc7530f1213e124d248cc176a7cfe6180.zip | |
Fixing all of the classes that I just renamed, and adding
the TerminusSelector module to the File Metadata indirection.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/puppet/file_serving/content.rb | 2 | ||||
| -rw-r--r-- | lib/puppet/file_serving/metadata.rb | 3 | ||||
| -rw-r--r-- | lib/puppet/indirector/file_content/local.rb | 2 | ||||
| -rw-r--r-- | lib/puppet/indirector/file_metadata/local.rb | 2 |
4 files changed, 5 insertions, 4 deletions
diff --git a/lib/puppet/file_serving/content.rb b/lib/puppet/file_serving/content.rb index 53e52cd2d..38ca80fb0 100644 --- a/lib/puppet/file_serving/content.rb +++ b/lib/puppet/file_serving/content.rb @@ -11,7 +11,7 @@ require 'puppet/file_serving/terminus_selector' # asked for. class Puppet::FileServing::Content extend Puppet::Indirector - indirects :file_content, :terminus_class => :file, :extend => Puppet::FileServing::TerminusSelector + indirects :file_content, :extend => Puppet::FileServing::TerminusSelector attr_reader :path diff --git a/lib/puppet/file_serving/metadata.rb b/lib/puppet/file_serving/metadata.rb index 29a395c6a..73e1f53d4 100644 --- a/lib/puppet/file_serving/metadata.rb +++ b/lib/puppet/file_serving/metadata.rb @@ -6,13 +6,14 @@ require 'puppet' require 'puppet/indirector' require 'puppet/file_serving' require 'puppet/util/checksums' +require 'puppet/file_serving/terminus_selector' # A class that handles retrieving file metadata. class Puppet::FileServing::Metadata include Puppet::Util::Checksums extend Puppet::Indirector - indirects :file_metadata, :terminus_class => :ral + indirects :file_metadata, :extend => Puppet::FileServing::TerminusSelector attr_reader :path, :owner, :group, :mode, :checksum_type, :checksum diff --git a/lib/puppet/indirector/file_content/local.rb b/lib/puppet/indirector/file_content/local.rb index bb9dc6998..34d1c7794 100644 --- a/lib/puppet/indirector/file_content/local.rb +++ b/lib/puppet/indirector/file_content/local.rb @@ -6,7 +6,7 @@ require 'puppet/file_serving/content' require 'puppet/indirector/file_content' require 'puppet/indirector/file' -class Puppet::Indirector::FileContent::File < Puppet::Indirector::File +class Puppet::Indirector::FileContent::Local < Puppet::Indirector::File desc "Retrieve file contents from disk." def find(path) diff --git a/lib/puppet/indirector/file_metadata/local.rb b/lib/puppet/indirector/file_metadata/local.rb index 5777b1774..f6cfa1f1c 100644 --- a/lib/puppet/indirector/file_metadata/local.rb +++ b/lib/puppet/indirector/file_metadata/local.rb @@ -6,7 +6,7 @@ require 'puppet/file_serving/metadata' require 'puppet/indirector/file_metadata' require 'puppet/indirector/code' -class Puppet::Indirector::FileMetadata::Ral < Puppet::Indirector::Code +class Puppet::Indirector::FileMetadata::Local < Puppet::Indirector::Code desc "Retrieve file metadata using Puppet's Resource Abstraction Layer. Returns everything about the file except its content." |