diff options
| author | varac <varacanero@zeromail.org> | 2014-02-04 17:55:09 +0100 |
|---|---|---|
| committer | varac <varacanero@zeromail.org> | 2014-02-05 16:54:54 +0100 |
| commit | b449ad813d8c9672d23393ca30bbfd3dc1dd7fe3 (patch) | |
| tree | 78b94d9f3f0d92f63422edb57f2dec5c85adfff4 /manifests/agent.pp | |
| parent | 4cd47d03c68d8530dcbff37c5bc1cf6a8006d767 (diff) | |
don't install xinetd by default, restructed agent use of ssh
Diffstat (limited to 'manifests/agent.pp')
| -rw-r--r-- | manifests/agent.pp | 41 |
1 files changed, 24 insertions, 17 deletions
diff --git a/manifests/agent.pp b/manifests/agent.pp index c6e59ad..65571ff 100644 --- a/manifests/agent.pp +++ b/manifests/agent.pp @@ -10,20 +10,25 @@ class check_mk::agent ( $workspace = '/root/check_mk', $agent_package_name = 'check_mk-agent', $agent_logwatch_package_name = 'check_mk-agent-logwatch', - $use_ssh = false, + $method = 'xinetd', + $generate_sshkey = false, $use_ssh_tag = 'ssh', $register_agent = true ) { - if ( $use_ssh == true ) { - if ( $host_tags != '' ) { - $tags = "${host_tags}|${use_ssh_tag}" - } else { - $tags = $use_ssh_tag + case $method { + 'xinetd': { + $tags = $host_tags + include check_mk::agent::service } - } else { - $tags = $host_tags - include check_mk::agent::service + 'ssh': { + if ( $host_tags != '' ) { + $tags = "${host_tags}|${use_ssh_tag}" + } else { + $tags = $use_ssh_tag + } + } + default: { } } class { 'check_mk::agent::install': @@ -31,16 +36,18 @@ class check_mk::agent ( filestore => $filestore, workspace => $workspace, agent_package_name => $agent_package_name, - agent_logwatch_package_name => $agent_logwatch_package_name + 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, - use_cache => $use_cache, - user => $user, - use_ssh => $use_ssh, - require => Class['check_mk::agent::install'], + ip_whitelist => $ip_whitelist, + port => $port, + server_dir => $server_dir, + use_cache => $use_cache, + user => $user, + method => $method, + generate_sshkey => $generate_sshkey, + require => Class['check_mk::agent::install'], } if ( $register_agent ) { |