summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--manifests/agent/generate_sshkey.pp13
1 files changed, 8 insertions, 5 deletions
diff --git a/manifests/agent/generate_sshkey.pp b/manifests/agent/generate_sshkey.pp
index f01d2cf..c72da91 100644
--- a/manifests/agent/generate_sshkey.pp
+++ b/manifests/agent/generate_sshkey.pp
@@ -33,12 +33,15 @@ define check_mk::agent::generate_sshkey (
# and restrict it to running only the agent
if $authdir or $authfile {
# if $authkey or $authdir are set, override authorized_keys path and file
+ # and also override using the built-in ssh_authorized_key since it may
+ # not be able to write to $authdir
sshd::ssh_authorized_key { $ssh_key_name:
- type => 'ssh-rsa',
- key => $public_key,
- user => 'root',
- target => "${authdir}/${authfile}",
- options => "command=\"${command}\"";
+ type => 'ssh-rsa',
+ key => $public_key,
+ user => $sshuser,
+ target => "${authdir}/${authfile}",
+ override_builtin => true,
+ options => "command=\"${command}\"";
}
} else {
# otherwise use the defaults