aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGabriel Filion <lelutin@gmail.com>2011-01-20 02:25:32 -0500
committerGabriel Filion <lelutin@gmail.com>2011-01-30 21:15:35 -0500
commit5dd814871a25ee2ba3ecb4e4a880c368212631b9 (patch)
tree0c35446647355436154678645254b11b4060eed7
parent5bb61c2761210cff97b95c315fcc93c9c87e1c71 (diff)
downloadpuppet-sshd-5dd814871a25ee2ba3ecb4e4a880c368212631b9.tar.gz
puppet-sshd-5dd814871a25ee2ba3ecb4e4a880c368212631b9.tar.bz2
ssh_authorized_key: use $name for user by default
Currently ssh_authorized_key has some logic about $user being false or '', but it sets its value to default to 'root'. So, in order to use the name as the user's name, one has to clear the user parameter, which is totally redundant. Since it is sometimes useful to publish multiple keys for a user, the $user parameter is useful. To make using ssh_authorized_key for one-key normal users simpler, make $user default to being empty (which will use $name as the user name). 'root' can always be specified either via the name or by the $user paramter. Signed-off-by: Gabriel Filion <lelutin@gmail.com>
-rw-r--r--manifests/ssh_authorized_key.pp2
1 files changed, 1 insertions, 1 deletions
diff --git a/manifests/ssh_authorized_key.pp b/manifests/ssh_authorized_key.pp
index 575b654..40649b0 100644
--- a/manifests/ssh_authorized_key.pp
+++ b/manifests/ssh_authorized_key.pp
@@ -3,7 +3,7 @@ define sshd::ssh_authorized_key(
$ensure = 'present',
$type = 'ssh-dss',
$key = 'absent',
- $user = 'root',
+ $user = '',
$target = undef,
$options = 'absent'
){