diff options
Diffstat (limited to 'lib/puppet/sslcertificates')
| -rw-r--r-- | lib/puppet/sslcertificates/ca.rb | 18 | ||||
| -rw-r--r-- | lib/puppet/sslcertificates/inventory.rb | 2 | ||||
| -rw-r--r-- | lib/puppet/sslcertificates/support.rb | 8 |
3 files changed, 14 insertions, 14 deletions
diff --git a/lib/puppet/sslcertificates/ca.rb b/lib/puppet/sslcertificates/ca.rb index 5e355f7fe..fd416dd5e 100644 --- a/lib/puppet/sslcertificates/ca.rb +++ b/lib/puppet/sslcertificates/ca.rb @@ -53,7 +53,7 @@ class Puppet::SSLCertificates::CA end def initialize(hash = {}) - Puppet.config.use(:main, :ca, :ssl) + Puppet.settings.use(:main, :ca, :ssl) self.setconfig(hash) if Puppet[:capass] @@ -73,7 +73,7 @@ class Puppet::SSLCertificates::CA self.getcert init_crl unless FileTest.exists?(@config[:serial]) - Puppet.config.write(:serial) do |f| + Puppet.settings.write(:serial) do |f| f << "%04X" % 1 end end @@ -85,7 +85,7 @@ class Puppet::SSLCertificates::CA 20.times { pass += (rand(74) + 48).chr } begin - Puppet.config.write(:capass) { |f| f.print pass } + Puppet.settings.write(:capass) { |f| f.print pass } rescue Errno::EACCES => detail raise Puppet::Error, detail.to_s end @@ -163,10 +163,10 @@ class Puppet::SSLCertificates::CA Puppet::Util::SUIDManager.asuser(Puppet[:user], Puppet[:group]) do @cert = cert.mkselfsigned end - Puppet.config.write(:cacert) do |f| + Puppet.settings.write(:cacert) do |f| f.puts @cert.to_pem end - Puppet.config.write(:capub) do |f| + Puppet.settings.write(:capub) do |f| f.puts @cert.public_key end return cert @@ -201,7 +201,7 @@ class Puppet::SSLCertificates::CA # Take the Puppet config and store it locally. def setconfig(hash) @config = {} - Puppet.config.params("ca").each { |param| + Puppet.settings.params("ca").each { |param| param = param.intern if param.is_a? String if hash.include?(param) @config[param] = hash[param] @@ -303,7 +303,7 @@ class Puppet::SSLCertificates::CA raise Puppet::Error, "Certificate request for %s already exists" % host end - Puppet.config.writesub(:csrdir, csrfile) do |f| + Puppet.settings.writesub(:csrdir, csrfile) do |f| f.print csr.to_pem end end @@ -319,7 +319,7 @@ class Puppet::SSLCertificates::CA end Puppet::SSLCertificates::Inventory::add(cert) - Puppet.config.writesub(:signeddir, certfile) do |f| + Puppet.settings.writesub(:signeddir, certfile) do |f| f.print cert.to_pem end end @@ -389,7 +389,7 @@ class Puppet::SSLCertificates::CA @crl.next_update = now + 5 * 365*24*60*60 sign_with_key(@crl) - Puppet.config.write(:cacrl) do |f| + Puppet.settings.write(:cacrl) do |f| f.puts @crl.to_pem end end diff --git a/lib/puppet/sslcertificates/inventory.rb b/lib/puppet/sslcertificates/inventory.rb index d475c1c86..14d2155a8 100644 --- a/lib/puppet/sslcertificates/inventory.rb +++ b/lib/puppet/sslcertificates/inventory.rb @@ -11,7 +11,7 @@ module Puppet::SSLCertificates inited = false end - Puppet.config.write(:cert_inventory, "a") do |f| + Puppet.settings.write(:cert_inventory, "a") do |f| f.puts((inited ? nil : self.init).to_s + format(cert)) end end diff --git a/lib/puppet/sslcertificates/support.rb b/lib/puppet/sslcertificates/support.rb index e37a52038..c8d2e846b 100644 --- a/lib/puppet/sslcertificates/support.rb +++ b/lib/puppet/sslcertificates/support.rb @@ -44,7 +44,7 @@ module Puppet::SSLCertificates::Support unless instance_variable_get(var) unless cert = send(reader) cert = send(maker) - Puppet.config.write(param) { |f| f.puts cert.to_pem } + Puppet.settings.write(param) { |f| f.puts cert.to_pem } end instance_variable_set(var, cert) end @@ -59,7 +59,7 @@ module Puppet::SSLCertificates::Support # Our key meta programming can only handle one file, so we have # to separately write out the public key. - Puppet.config.write(:hostpubkey) do |f| + Puppet.settings.write(:hostpubkey) do |f| f.print key.public_key.to_pem end return key @@ -104,8 +104,8 @@ module Puppet::SSLCertificates::Support if cert.nil? or cert == "" return nil end - Puppet.config.write(:hostcert) do |f| f.print cert end - Puppet.config.write(:localcacert) do |f| f.print cacert end + Puppet.settings.write(:hostcert) do |f| f.print cert end + Puppet.settings.write(:localcacert) do |f| f.print cacert end #File.open(@certfile, "w", 0644) { |f| f.print cert } #File.open(@cacertfile, "w", 0644) { |f| f.print cacert } begin |