diff options
| author | varac <varacanero@zeromail.org> | 2016-03-01 15:41:31 +0100 |
|---|---|---|
| committer | varac <varacanero@zeromail.org> | 2016-03-01 15:41:31 +0100 |
| commit | a050fbb81b3b218518d079c6c83c6bcd48485340 (patch) | |
| tree | aedb887751cc45e6fc1e88532354266ba8f7abd0 /manifests/agent/generate_sshkey.pp | |
| parent | b0c973424dfca43087636ac75f9f0674adda5d6e (diff) | |
| parent | dc9d8cca10d64ab7027f6c876a3bc89e19cf4639 (diff) | |
Merge remote-tracking branch 'shared/master' into leap_master
Diffstat (limited to 'manifests/agent/generate_sshkey.pp')
| -rw-r--r-- | manifests/agent/generate_sshkey.pp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/manifests/agent/generate_sshkey.pp b/manifests/agent/generate_sshkey.pp index d2d1d39..b00271f 100644 --- a/manifests/agent/generate_sshkey.pp +++ b/manifests/agent/generate_sshkey.pp @@ -15,11 +15,12 @@ define check_mk::agent::generate_sshkey ( $ssh_key_basepath = '/etc/puppet/modules/check_mk/keys', # user on the client the check_mk server will ssh to, to run the agent $sshuser = 'root', + $hostname = $::fqdn, $check_mk_tag = 'check_mk_sshkey' ){ # generate check-mk ssh keypair, stored on puppetmaster - $ssh_key_name = "${::fqdn}_id_rsa" + $ssh_key_name = "${hostname}_id_rsa" $ssh_keys = ssh_keygen("${ssh_key_basepath}/${ssh_key_name}") $public = split($ssh_keys[1],' ') $public_type = $public[0] @@ -46,6 +47,7 @@ define check_mk::agent::generate_sshkey ( target => "${authdir}/${authfile}", override_builtin => true, options => "command=\"${command}\""; + } } else { # otherwise use the defaults sshd::ssh_authorized_key { $ssh_key_name: |