diff options
| author | luke <luke@980ebf18-57e1-0310-9a29-db15c13687c0> | 2007-03-06 19:03:05 +0000 |
|---|---|---|
| committer | luke <luke@980ebf18-57e1-0310-9a29-db15c13687c0> | 2007-03-06 19:03:05 +0000 |
| commit | 46d344b9daa24047b60183cc94509d306b6b562a (patch) | |
| tree | 3c11eaad696ba3d6e6dd40bd7b9e7d1a4a71af85 /lib/puppet/sslcertificates/ca.rb | |
| parent | 68233706a9ff05be8fa8ab3ab7198cd0918517d6 (diff) | |
| download | puppet-46d344b9daa24047b60183cc94509d306b6b562a.tar.gz puppet-46d344b9daa24047b60183cc94509d306b6b562a.tar.xz puppet-46d344b9daa24047b60183cc94509d306b6b562a.zip | |
Merging the webserver_portability branch from version 2182 to version 2258.
git-svn-id: https://reductivelabs.com/svn/puppet/trunk@2259 980ebf18-57e1-0310-9a29-db15c13687c0
Diffstat (limited to 'lib/puppet/sslcertificates/ca.rb')
| -rw-r--r-- | lib/puppet/sslcertificates/ca.rb | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/lib/puppet/sslcertificates/ca.rb b/lib/puppet/sslcertificates/ca.rb index 42ad57e48..723a0444b 100644 --- a/lib/puppet/sslcertificates/ca.rb +++ b/lib/puppet/sslcertificates/ca.rb @@ -5,8 +5,6 @@ class Puppet::SSLCertificates::CA attr_accessor :keyfile, :file, :config, :dir, :cert, :crl Puppet.setdefaults(:ca, - :ca => [true, - "Whether a CA should be started in puppetmasterd."], :cadir => { :default => "$ssldir/ca", :owner => "$user", :group => "$group", @@ -97,7 +95,7 @@ class Puppet::SSLCertificates::CA if FileTest.exists?(file) begin - if Puppet.execname == "puppetca" + if Puppet[:name] == "puppetca" puts "Removing %s" % file else Puppet.info "Removing %s" % file |