Merge remote-tracking branch 'riseup/master'

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

5 files changed, 43 insertions, 33 deletions

diff --git a/README.md b/README.md
index 79710aa..0f567ee 100644
--- a/README.md
+++ b/README.md
@@ -203,3 +203,7 @@ You can also include host tags - for example:
       'host2.domain|windows|prod',
 
 Remember to run the Puppet agent on your monitoring host to pick up any changes.
+
+This is the riseup clone, available at:
+
+git://labs.riseup.net/module_check_mk
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 ) {
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'
 ){
 
diff --git a/manifests/config.pp b/manifests/config.pp
index 73e4882..fdc3f1b 100644
--- a/manifests/config.pp
+++ b/manifests/config.pp
@@ -1,9 +1,9 @@
 class check_mk::config (
   $site,
   $host_groups = undef,
-) {
-  $etc_dir = "/omd/sites/${site}/etc"
+  $etc_dir = "/omd/sites/${site}/etc",
   $bin_dir = "/omd/sites/${site}/bin"
+) {
   file { "${etc_dir}/nagios/local":
     ensure => directory,
   }
@@ -12,13 +12,13 @@ class check_mk::config (
     line    => "cfg_dir=${etc_dir}/nagios/local",
     path    => "${etc_dir}/nagios/nagios.cfg",
     require => File["${etc_dir}/nagios/local"],
-    notify  => Class['check_mk::service'],
+    #notify  => Class['check_mk::service'],
   }
   file_line { 'add-guest-users':
     ensure => present,
     line   => 'guest_users = [ "guest" ]',
     path   => "${etc_dir}/check_mk/multisite.mk",
-    notify => Class['check_mk::service'],
+    #notify => Class['check_mk::service'],
   }
   concat { "${etc_dir}/check_mk/main.mk":
     owner  => 'root',