diff options
author | Matt Taggart <taggart@riseup.net> | 2014-04-22 00:17:34 -0700 |
---|---|---|
committer | Matt Taggart <taggart@riseup.net> | 2014-04-22 00:17:34 -0700 |
commit | 25b9b5f7cd2d64f464fb198d90cc757a1bff1c81 (patch) | |
tree | b45362c40c5afd1dc18e6d8edfb7a6a30eff6b94 /manifests/agent.pp | |
parent | 88d466e3aca349b3f129dd8e8967b90002a2584b (diff) |
replace homedir with more specific keydir, authdir, and authfile in order to allow overriding each. modify ::agent, ::agent::config, and ::agent::generate_sshkey to allow changing at each level, with reasonable defaults
Diffstat (limited to 'manifests/agent.pp')
-rw-r--r-- | manifests/agent.pp | 44 |
1 files changed, 33 insertions, 11 deletions
diff --git a/manifests/agent.pp b/manifests/agent.pp index 2ff9da5..505db64 100644 --- a/manifests/agent.pp +++ b/manifests/agent.pp @@ -4,7 +4,9 @@ class check_mk::agent ( $ip_whitelist = undef, $port = '6556', $server_dir = '/usr/bin', - $homedir = '/omd/sites/monitoring', + $keydir = '/omd/sites/monitoring', + $authdir = '/omd/sites/monitoring', + $authfile = undef, $use_cache = false, $user = 'root', $version = undef, @@ -40,16 +42,36 @@ class check_mk::agent ( agent_logwatch_package_name => $agent_logwatch_package_name, method => $method } - class { 'check_mk::agent::config': - ip_whitelist => $ip_whitelist, - port => $port, - server_dir => $server_dir, - homedir => $homedir, - use_cache => $use_cache, - user => $user, - method => $method, - generate_sshkey => $generate_sshkey, - require => Class['check_mk::agent::install'], + + if $authfile { + # if authfile is set, pass it though + class { 'check_mk::agent::config': + ip_whitelist => $ip_whitelist, + port => $port, + server_dir => $server_dir, + keydir => $keydir, + authdir => $authdir, + authfile => $authfile, + use_cache => $use_cache, + user => $user, + method => $method, + generate_sshkey => $generate_sshkey, + require => Class['check_mk::agent::install'], + } + } else { + # otherwise don't + class { 'check_mk::agent::config': + ip_whitelist => $ip_whitelist, + port => $port, + server_dir => $server_dir, + keydir => $keydir, + authdir => $authdir, + use_cache => $use_cache, + user => $user, + method => $method, + generate_sshkey => $generate_sshkey, + require => Class['check_mk::agent::install'], + } } if ( $register_agent ) { |