Please review pull request #229: Changes related to Bug #10914 opened by (tangledhelix)
Description:
See https://projects.puppetlabs.com/issues/10914
- Opened: Tue Nov 22 18:35:40 UTC 2011
- Based on: puppetlabs:master (26ce9c79672d578e9aa03d8341d8c315fcf30c8b)
- Requested merge: tangledhelix:master (6a9fe6485374b73828ceddb9e16f6dafd7cfecb5)
Diff follows:
diff --git a/lib/puppet/defaults.rb b/lib/puppet/defaults.rb
index 360fd5a..6b3b0de 100644
--- a/lib/puppet/defaults.rb
+++ b/lib/puppet/defaults.rb
@@ -272,6 +272,7 @@ EOT
:certdir => {
:default => "$ssldir/certs",
:owner => "service",
+ :group => "service",
:desc => "The certificate directory."
},
:ssldir => {
@@ -288,11 +289,13 @@ EOT
:requestdir => {
:default => "$ssldir/certificate_requests",
:owner => "service",
+ :group => "service",
:desc => "Where host certificate requests are stored."
},
:privatekeydir => { :default => "$ssldir/private_keys",
:mode => 0750,
:owner => "service",
+ :group => "service",
:desc => "The private key directory."
},
:privatedir => { :default => "$ssldir/private",
@@ -329,11 +332,13 @@ EOT
:localcacert => { :default => "$certdir/ca.pem",
:mode => 0644,
:owner => "service",
+ :group => "service",
:desc => "Where each client stores the CA certificate."
},
:hostcrl => { :default => "$ssldir/crl.pem",
:mode => 0644,
:owner => "service",
+ :group => "service",
:desc => "Where the host's certificate revocation list can be found.
This is distinct from the certificate authority's CRL."
},
diff --git a/lib/puppet/indirector/key/file.rb b/lib/puppet/indirector/key/file.rb
index 1990f1a..0d6ab05 100644
--- a/lib/puppet/indirector/key/file.rb
+++ b/lib/puppet/indirector/key/file.rb
@@ -34,7 +34,7 @@ class Puppet::SSL::Key::File < Puppet::Indirector::SslFile
super
begin
- Puppet.settings.writesub(:publickeydir, public_key_path(request.key)) { |f| f.print request.instance.content.public_key.to_pem }
+ Puppet.settings.writesub(:capub, public_key_path(request.key)) { |f| f.print request.instance.content.public_key.to_pem }
rescue => detail
raise Puppet::Error, "Could not write #{request.key}: #{detail}"
end
-- You received this message because you are subscribed to the Google Groups "Puppet Developers" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to [email protected].
For more options, visit this group at http://groups.google.com/group/puppet-dev?hl=en.
