From b449ad813d8c9672d23393ca30bbfd3dc1dd7fe3 Mon Sep 17 00:00:00 2001
From: varac <varacanero@zeromail.org>
Date: Tue, 4 Feb 2014 17:55:09 +0100
Subject: don't install xinetd by default, restructed agent use of ssh

---
 manifests/agent/config.pp | 43 ++++++++++++++++++++++++-------------------
 1 file changed, 24 insertions(+), 19 deletions(-)

(limited to 'manifests/agent/config.pp')

diff --git a/manifests/agent/config.pp b/manifests/agent/config.pp
index 82636f5..460b2b2 100644
--- a/manifests/agent/config.pp
+++ b/manifests/agent/config.pp
@@ -4,7 +4,8 @@ class check_mk::agent::config (
   $server_dir,
   $use_cache,
   $user,
-  $use_ssh = false
+  $method          = 'xinetd',
+  $generate_sshkey = false,
 ) {
   if $use_cache {
     $server = "${server_dir}/check_mk_caching_agent"
@@ -12,25 +13,29 @@ class check_mk::agent::config (
   else {
     $server = "${server_dir}/check_mk_agent"
   }
-
-  if ( $use_ssh == true ){
-    check_mk::agent::generate_sshkey { 'check_mk_key': }
-  } else {
-
-    if $ip_whitelist {
-      $only_from = join($ip_whitelist, ' ')
+  case $method {
+    'xinetd': {
+      if $ip_whitelist {
+        $only_from = join($ip_whitelist, ' ')
+      }
+      else {
+        $only_from = undef
+      }
+      file { '/etc/xinetd.d/check_mk':
+        ensure  => present,
+        owner   => 'root',
+        group   => 'root',
+        mode    => '0444',
+        content => template('check_mk/agent/check_mk.erb'),
+        require => Package['check_mk-agent','check_mk-agent-logwatch'],
+        notify  => Class['check_mk::agent::service'],
+      }
     }
-    else {
-      $only_from = undef
-    }
-    file { '/etc/xinetd.d/check_mk':
-      ensure  => present,
-      owner   => 'root',
-      group   => 'root',
-      mode    => '0444',
-      content => template('check_mk/agent/check_mk.erb'),
-      require => Package['check_mk-agent','check_mk-agent-logwatch'],
-      notify  => Class['check_mk::agent::service'],
+    'ssh'   : {
+      if $generate_sshkey {
+        check_mk::agent::generate_sshkey { 'check_mk_key': }
+      }
     }
+    default : {}
   }
 }
-- 
cgit v1.2.3