From 060124b047ac44f9f54573a389fea6c5b6ab18ea Mon Sep 17 00:00:00 2001
From: varac <varacanero@zeromail.org>
Date: Wed, 12 Feb 2014 18:14:19 +0100
Subject: renamed site_check_mk::client to site_check_mk::agent

---
 puppet/modules/site_check_mk/manifests/agent.pp  | 24 ++++++++++++++++++++++++
 puppet/modules/site_check_mk/manifests/client.pp | 24 ------------------------
 puppet/modules/site_config/manifests/default.pp  |  2 +-
 3 files changed, 25 insertions(+), 25 deletions(-)
 create mode 100644 puppet/modules/site_check_mk/manifests/agent.pp
 delete mode 100644 puppet/modules/site_check_mk/manifests/client.pp

(limited to 'puppet')

diff --git a/puppet/modules/site_check_mk/manifests/agent.pp b/puppet/modules/site_check_mk/manifests/agent.pp
new file mode 100644
index 00000000..bb0cb167
--- /dev/null
+++ b/puppet/modules/site_check_mk/manifests/agent.pp
@@ -0,0 +1,24 @@
+class site_check_mk::agent {
+
+  $ssh_hash = hiera('ssh')
+  $pubkey   = $ssh_hash['authorized_keys']['monitor']['key']
+  $type     = $ssh_hash['authorized_keys']['monitor']['type']
+
+  include site_apt::preferences::check_mk
+
+  class { 'check_mk::agent':
+    agent_package_name          => 'check-mk-agent',
+    agent_logwatch_package_name => 'check-mk-agent-logwatch',
+    method                      => 'ssh',
+    homedir                     => '/etc/nagios/check_mk',
+    register_agent              => false
+  }
+
+  file { '/root/.ssh/authorized_keys2':
+    owner   => 'root',
+    group   => 'root',
+    mode    => '0600',
+    content => "command=\"/usr/bin/check_mk_agent\",no-port-forwarding,no-x11-forwarding,no-agent-forwarding,no-pty,no-user-rc, ${type} ${pubkey} monitor"
+  }
+
+}
diff --git a/puppet/modules/site_check_mk/manifests/client.pp b/puppet/modules/site_check_mk/manifests/client.pp
deleted file mode 100644
index ae269168..00000000
--- a/puppet/modules/site_check_mk/manifests/client.pp
+++ /dev/null
@@ -1,24 +0,0 @@
-class site_check_mk::client {
-
-  $ssh_hash = hiera('ssh')
-  $pubkey   = $ssh_hash['authorized_keys']['monitor']['key']
-  $type     = $ssh_hash['authorized_keys']['monitor']['type']
-
-  include site_apt::preferences::check_mk
-
-  class { 'check_mk::agent':
-    agent_package_name          => 'check-mk-agent',
-    agent_logwatch_package_name => 'check-mk-agent-logwatch',
-    method                      => 'ssh',
-    homedir                     => '/etc/nagios/check_mk',
-    register_agent              => false
-  }
-
-  file { '/root/.ssh/authorized_keys2':
-    owner   => 'root',
-    group   => 'root',
-    mode    => '0600',
-    content => "command=\"/usr/bin/check_mk_agent\",no-port-forwarding,no-x11-forwarding,no-agent-forwarding,no-pty,no-user-rc, ${type} ${pubkey} monitor"
-  }
-
-}
diff --git a/puppet/modules/site_config/manifests/default.pp b/puppet/modules/site_config/manifests/default.pp
index 25f9b3f8..53cc60f6 100644
--- a/puppet/modules/site_config/manifests/default.pp
+++ b/puppet/modules/site_config/manifests/default.pp
@@ -87,5 +87,5 @@ class site_config::default {
     include ::site_custom
   }
 
-  include site_check_mk::client
+  include site_check_mk::agent
 }
-- 
cgit v1.2.3