summaryrefslogtreecommitdiffstats
path: root/lib/puppet/sslcertificates.rb
diff options
context:
space:
mode:
authorluke <luke@980ebf18-57e1-0310-9a29-db15c13687c0>2005-10-21 06:16:43 +0000
committerluke <luke@980ebf18-57e1-0310-9a29-db15c13687c0>2005-10-21 06:16:43 +0000
commita232e5c6ef359b600cdbc618a9791f8eda8eb081 (patch)
tree7ec9cc3700f0daae1b5216a9afd0f220a553f9b6 /lib/puppet/sslcertificates.rb
parenta6d02920d360ac06815dcf08f3350ba92088301d (diff)
downloadpuppet-a232e5c6ef359b600cdbc618a9791f8eda8eb081.tar.gz
puppet-a232e5c6ef359b600cdbc618a9791f8eda8eb081.tar.xz
puppet-a232e5c6ef359b600cdbc618a9791f8eda8eb081.zip
Made tweaks here and there to get it running better on my local network. I am inches away from that happening. All tests pass.
git-svn-id: https://reductivelabs.com/svn/puppet/trunk@720 980ebf18-57e1-0310-9a29-db15c13687c0
Diffstat (limited to 'lib/puppet/sslcertificates.rb')
-rwxr-xr-xlib/puppet/sslcertificates.rb5
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/puppet/sslcertificates.rb b/lib/puppet/sslcertificates.rb
index bc3382ab6..6dcd25656 100755
--- a/lib/puppet/sslcertificates.rb
+++ b/lib/puppet/sslcertificates.rb
@@ -207,7 +207,7 @@ module SSLCertificates
:serial => [:cadir, "serial"],
:privatedir => [:ssldir, "private"],
:passfile => [:privatedir, "password"],
- :autosign => [:ssldir, "autosign.conf"],
+ :autosign => [:puppetconf, "autosign.conf"],
:ca_crl_days => 365,
:ca_days => 1825,
:ca_md => "md5",
@@ -443,7 +443,8 @@ module SSLCertificates
certfile = host2certfile(host)
if File.exists?(certfile)
- Puppet.notice "Overwriting signed certificate for %s" % host
+ Puppet.notice "Overwriting signed certificate %s for %s" %
+ [certfile, host]
end
File.open(certfile, "w", 0660) { |f|