Merge branch 'master' into 'master'

check_mk: syntax fixes, linting, version overrides

A couple small commits to fix some syntax errors, cleanup whitespace and lint, and allow for version overrides

See merge request !4

1 files changed, 20 insertions, 18 deletions

diff --git a/manifests/agent/config.pp b/manifests/agent/config.pp
index 36f2910..5907d43 100644
--- a/manifests/agent/config.pp
+++ b/manifests/agent/config.pp
@@ -13,29 +13,30 @@ class check_mk::agent::config (
 ) {
   if $use_cache {
     $server = "${server_dir}/check_mk_caching_agent"
-  }
-  else {
+  } else {
     $server = "${server_dir}/check_mk_agent"
   }
+
   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'   : {
+
+    'ssh': {
       if $generate_sshkey {
         check_mk::agent::generate_sshkey { "check_mk_key_${::fqdn}":
           keydir   => $keydir,
@@ -50,6 +51,7 @@ class check_mk::agent::config (
         ensure  => absent;
       }
     }
+
     default : {}
   }
 }