Merge remote-tracking branch 'riseup/master'

Conflicts:
	manifests/agent.pp
	manifests/agent/config.pp

1 files changed, 15 insertions, 12 deletions

diff --git a/manifests/agent.pp b/manifests/agent.pp
index 65571ff..6383ab9 100644
--- a/manifests/agent.pp
+++ b/manifests/agent.pp
@@ -4,6 +4,7 @@ class check_mk::agent (
   $ip_whitelist = undef,
   $port         = '6556',
   $server_dir   = '/usr/bin',
+  $homedir      = '/omd/sites/monitoring',
   $use_cache    = false,
   $user         = 'root',
   $version      = undef,
@@ -22,13 +23,14 @@ class check_mk::agent (
       include check_mk::agent::service
     }
     'ssh': {
-      if ( $host_tags != '' ) {
-        $tags = "${host_tags}|${use_ssh_tag}"
-      } else {
-        $tags = $use_ssh_tag
-      }
+    if ( $host_tags != '' ) {
+      $tags = "${host_tags}|${use_ssh_tag}"
+    } else {
+      $tags = $use_ssh_tag
     }
-    default:  { }
+  } else {
+    $tags = $host_tags
+    include check_mk::agent::service
   }
 
   class { 'check_mk::agent::install':
@@ -40,14 +42,15 @@ class check_mk::agent (
     method                      => $method
   }
   class { 'check_mk::agent::config':
-    ip_whitelist       => $ip_whitelist,
-    port               => $port,
-    server_dir         => $server_dir,
-    use_cache          => $use_cache,
-    user               => $user,
+    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'],
+    require      => Class['check_mk::agent::install'],
   }
 
   if ( $register_agent ) {