[Pkg-puppet-devel] [SCM] Puppet packaging for Debian branch, experimental, updated. debian/2.6.8-1-844-g7ec39d5
Richard Crowley
r at rcrowley.org
Tue May 10 08:07:27 UTC 2011
The following commit has been merged in the experimental branch:
commit 562bd0f10be966bef725896af9ec3cdc30771ac6
Author: Richard Crowley <r at rcrowley.org>
Date: Wed Mar 23 00:14:59 2011 +0000
Use the new name for the terminus.
diff --git a/lib/puppet/application/certificate.rb b/lib/puppet/application/certificate.rb
index edb4eef..48736fc 100644
--- a/lib/puppet/application/certificate.rb
+++ b/lib/puppet/application/certificate.rb
@@ -6,12 +6,7 @@ class Puppet::Application::Certificate < Puppet::Application::IndirectionBase
# Since these options map CA terminology to indirector terminology, it's
# now called --ca-location.
option "--ca-location CA_LOCATION" do |arg|
- handle_terminus({
- :local => :file,
- :remote => :rest,
- :only => :file,
- :none => nil,
- }[arg.to_sym])
+ Puppet::SSL::Host.ca_location = arg.to_sym
end
end
diff --git a/lib/puppet/interface/certificate.rb b/lib/puppet/interface/certificate.rb
index c2101d9..32415ea 100644
--- a/lib/puppet/interface/certificate.rb
+++ b/lib/puppet/interface/certificate.rb
@@ -13,8 +13,7 @@ Puppet::Interface::Indirector.interface(:certificate) do
set_run_mode Puppet::Application[:certificate].class.run_mode
end
- Puppet::SSL::CertificateStatus.indirection.save(
- Puppet::SSL::CertificateStatus.new(name))
+ Puppet::SSL::Host.indirection.save(Puppet::SSL::Host.new(name))
end
--
Puppet packaging for Debian
More information about the Pkg-puppet-devel
mailing list