From bb832e0f0fa92627412058f690b45eec0b4bbadc Mon Sep 17 00:00:00 2001
From: Matt Taggart <taggart@riseup.net>
Date: Tue, 13 May 2014 10:27:34 -0700
Subject: use new override_builtin parameter to fix problem with central
 authorized_keys directory, use sshuser

---
 manifests/agent/generate_sshkey.pp | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

(limited to 'manifests')

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
-- 
cgit v1.2.3