summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrancois Deppierraz <francois@ctrlaltdel.ch>2008-09-27 18:52:58 +0200
committerJames Turnbull <james@lovedthanlost.net>2008-10-07 00:25:33 +1100
commit5268487ac862eec6381d315800d6f56c51dc57b5 (patch)
tree6ec7937e422b18f3a92b116a76dec4b11fe784c8
parent990e8e3caadf488b5dd1d6b3bcb30df492f99647 (diff)
downloadpuppet-5268487ac862eec6381d315800d6f56c51dc57b5.tar.gz
puppet-5268487ac862eec6381d315800d6f56c51dc57b5.tar.xz
puppet-5268487ac862eec6381d315800d6f56c51dc57b5.zip
Fixed documentation, typo and added CHANGELOG entry
-rw-r--r--CHANGELOG2
-rw-r--r--lib/puppet/type/ssh_authorized_key.rb6
2 files changed, 5 insertions, 3 deletions
diff --git a/CHANGELOG b/CHANGELOG
index fec8ad6fa..66f40f60e 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -45,6 +45,8 @@
Fixed #791 - You should now be able to create and find a user/group in one transaction.
Fixed #1610 - Raise "Filebucketed" messages to Notice priority
+
+ FIxed #1530 - ssh_authorized_keys provider does not crash anymore on SSH type 1 keys
Added a number of confines to package providers
diff --git a/lib/puppet/type/ssh_authorized_key.rb b/lib/puppet/type/ssh_authorized_key.rb
index 1db4a0ac3..4afca1cca 100644
--- a/lib/puppet/type/ssh_authorized_key.rb
+++ b/lib/puppet/type/ssh_authorized_key.rb
@@ -1,6 +1,7 @@
module Puppet
newtype(:ssh_authorized_key) do
- @doc = "Manages ssh authorized keys."
+ @doc = "Manages SSH authorized keys. Currently only type 2 keys are
+ supported."
ensurable
@@ -11,8 +12,7 @@ module Puppet
end
newproperty(:type) do
- desc "The encryption type used. Usually ssh-dss or ssh-rsa for
- SSH version 2. Not used for SSH version 1."
+ desc "The encryption type used: ssh-dss or ssh-rsa."
newvalue("ssh-dss")
newvalue("ssh-rsa")