Please review pull request #600: Remove 'ca_md' option from the documentation. opened by (mzs-github)

Description:

certificate_authority.rb is hardcoded to use SHA1.

Signed-off-by: Michael Smith mich...@hurts.ca

  • Opened: Tue Mar 27 13:15:35 UTC 2012
  • Based on: puppetlabs:master (1d09389a06560308668b2d2cfb4faa5727620e35)
  • Requested merge: mzs-github:remove_ca_md (29647d3c60ed8cb7ccadf14d4085a6928c359672)

Diff follows:

diff --git a/lib/puppet/defaults.rb b/lib/puppet/defaults.rb
index 6aac56a..7fa1a3a 100644
--- a/lib/puppet/defaults.rb
+++ b/lib/puppet/defaults.rb
@@ -639,10 +639,6 @@ module Puppet
       is set, ca_days is ignored. Examples are '3600' (one hour)
       and '1825d', which is the same as '5y' (5 years) ",
 		},
-    :ca_md => {
-			:default		=> "md5",
-			:desc				=> "The type of hash used in certificates.",
-		},
     :req_bits => {
 			:default		=> 4096,
 			:desc				=> "The bit length of the certificates.",
diff --git a/man/man5/puppet.conf.5 b/man/man5/puppet.conf.5
index 9df8f1e..e1115c0 100644
--- a/man/man5/puppet.conf.5
+++ b/man/man5/puppet.conf.5
@@ -107,14 +107,6 @@ Wether the master should function as a certificate authority\.
 .SS "ca_days"
 How long a certificate should be valid\. This parameter is deprecated, use ca_ttl instead
 .
-.SS "ca_md"
-The type of hash used in certificates\.
-.
-.IP "\(bu" 4
-\fIDefault\fR: md5
-.
-.IP "" 0
-.
 .SS "ca_name"
 The name to use the Certificate Authority certificate\.
 .

    

--
You received this message because you are subscribed to the Google Groups "Puppet Developers" group.
To post to this group, send email to puppet-dev@googlegroups.com.
To unsubscribe from this group, send email to puppet-dev+unsubscr...@googlegroups.com.
For more options, visit this group at http://groups.google.com/group/puppet-dev?hl=en.

Reply via email to