diff options
Diffstat (limited to 'lib/puppet/application')
| -rw-r--r-- | lib/puppet/application/filebucket.rb | 9 | ||||
| -rw-r--r-- | lib/puppet/application/server.rb | 1 |
2 files changed, 5 insertions, 5 deletions
diff --git a/lib/puppet/application/filebucket.rb b/lib/puppet/application/filebucket.rb index 0723054df..09aaf2b5d 100644 --- a/lib/puppet/application/filebucket.rb +++ b/lib/puppet/application/filebucket.rb @@ -1,6 +1,6 @@ require 'puppet' require 'puppet/application' -require 'puppet/network/client' +require 'puppet/file_bucket/dipper' Puppet::Application.new(:filebucket) do @@ -70,10 +70,10 @@ Puppet::Application.new(:filebucket) do begin if options[:local] or options[:bucket] path = options[:bucket] || Puppet[:bucketdir] - @client = Puppet::Network::Client.dipper.new(:Path => path) + @client = Puppet::FileBucket::Dipper.new(:Path => path) else require 'puppet/network/handler' - @client = Puppet::Network::Client.dipper.new(:Server => Puppet[:server]) + @client = Puppet::FileBucket::Dipper.new(:Server => Puppet[:server]) end rescue => detail $stderr.puts detail @@ -84,4 +84,5 @@ Puppet::Application.new(:filebucket) do end end -end
\ No newline at end of file +end + diff --git a/lib/puppet/application/server.rb b/lib/puppet/application/server.rb index afdad54fb..7aeb6ad5d 100644 --- a/lib/puppet/application/server.rb +++ b/lib/puppet/application/server.rb @@ -81,7 +81,6 @@ Puppet::Application.new(:server) do require 'etc' require 'puppet/file_serving/content' require 'puppet/file_serving/metadata' - require 'puppet/checksum' xmlrpc_handlers = [:Status, :FileServer, :Master, :Report, :Filebucket] |