Merge remote-tracking branch 'riseup/master'

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

2 files changed, 20 insertions, 17 deletions

diff --git a/manifests/agent/config.pp b/manifests/agent/config.pp
index 460b2b2..256af8f 100644
--- a/manifests/agent/config.pp
+++ b/manifests/agent/config.pp
@@ -2,6 +2,7 @@ class check_mk::agent::config (
   $ip_whitelist = '',
   $port,
   $server_dir,
+  $homedir,
   $use_cache,
   $user,
   $method          = 'xinetd',
@@ -15,25 +16,27 @@ class check_mk::agent::config (
   }
   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'],
-      }
+    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'],
+    }
     }
     'ssh'   : {
       if $generate_sshkey {
-        check_mk::agent::generate_sshkey { 'check_mk_key': }
+        check_mk::agent::generate_sshkey { 'check_mk_key':
+          homedir => $homedir
+        }
       }
     }
     default : {}
diff --git a/manifests/agent/generate_sshkey.pp b/manifests/agent/generate_sshkey.pp
index 58ce6fe..3187037 100644
--- a/manifests/agent/generate_sshkey.pp
+++ b/manifests/agent/generate_sshkey.pp
@@ -2,7 +2,7 @@ define check_mk::agent::generate_sshkey(
   $ssh_key_basepath = '/etc/puppet/modules/keys/files/check_mk_keys',
   $user             = 'monitoring',
   $group            = 'monitoring',
-  $homedir          = '/omd/sites/monitoring',
+  $homedir,
   $check_mk_tag     = 'check_mk_sshkey'
 ){