summaryrefslogtreecommitdiffstats
path: root/lib/puppet
diff options
context:
space:
mode:
authorFrancois Deppierraz <francois@ctrlaltdel.ch>2009-05-25 09:44:59 +0200
committerJames Turnbull <james@ubuntu904.lovedthanlost.net>2009-05-26 13:42:30 +1000
commit3995e7026dd40778cff1025a8e7e28eec833545f (patch)
tree19934dd12e03099e2085812ddca860e1dad47de0 /lib/puppet
parentcb4a4d3344169a75224caa6488e3aa59f85218de (diff)
downloadpuppet-3995e7026dd40778cff1025a8e7e28eec833545f.tar.gz
puppet-3995e7026dd40778cff1025a8e7e28eec833545f.tar.xz
puppet-3995e7026dd40778cff1025a8e7e28eec833545f.zip
Fix #2300 - Update ssh_authorized_key documentation
Diffstat (limited to 'lib/puppet')
-rw-r--r--lib/puppet/type/ssh_authorized_key.rb11
1 files changed, 8 insertions, 3 deletions
diff --git a/lib/puppet/type/ssh_authorized_key.rb b/lib/puppet/type/ssh_authorized_key.rb
index a16746ac4..52c650998 100644
--- a/lib/puppet/type/ssh_authorized_key.rb
+++ b/lib/puppet/type/ssh_authorized_key.rb
@@ -6,7 +6,8 @@ module Puppet
ensurable
newparam(:name) do
- desc "The SSH key comment."
+ desc "The SSH key comment. This attribute is currently used as a
+ system-wide primary key and therefore has to be unique."
isnamevar
end
@@ -26,11 +27,15 @@ module Puppet
end
newproperty(:user) do
- desc "The user account in which the SSH key should be installed."
+ desc "The user account in which the SSH key should be installed.
+ The resource will automatically depend on this user."
end
newproperty(:target) do
- desc "The file in which to store the SSH key."
+ desc "The absolute filename in which to store the SSH key. This
+ property is optional and should only be used in cases where keys
+ are stored in a non-standard location (ie not in
+ ~user/.ssh/authorized_keys)."
defaultto :absent