fix some else statements, adjust whitespace and indenting to be more sane, minor linting

2 files changed, 21 insertions, 22 deletions

diff --git a/manifests/agent/config.pp b/manifests/agent/config.pp
index 256af8f..13fba61 100644
--- a/manifests/agent/config.pp
+++ b/manifests/agent/config.pp
@@ -10,35 +10,37 @@ 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':
           homedir => $homedir
         }
       }
     }
+
     default : {}
   }
 }
diff --git a/manifests/agent/generate_sshkey.pp b/manifests/agent/generate_sshkey.pp
index 3187037..4742238 100644
--- a/manifests/agent/generate_sshkey.pp
+++ b/manifests/agent/generate_sshkey.pp
@@ -1,8 +1,8 @@
 define check_mk::agent::generate_sshkey(
+  $homedir,
   $ssh_key_basepath = '/etc/puppet/modules/keys/files/check_mk_keys',
   $user             = 'monitoring',
   $group            = 'monitoring',
-  $homedir,
   $check_mk_tag     = 'check_mk_sshkey'
 ){
 
@@ -29,7 +29,6 @@ define check_mk::agent::generate_sshkey(
     tag     => $check_mk_tag;
   }
 
-
   @@file { "${homedir}/.ssh/${ssh_key_name}.pub":
     content => $public_key,
     owner   => $user,
@@ -37,6 +36,4 @@ define check_mk::agent::generate_sshkey(
     mode    => '0666',
     tag     => $check_mk_tag;
   }
-
-
 }