From efc3e3eaa0788271cf61155d7e9be4d46e6e9d47 Mon Sep 17 00:00:00 2001
From: varac <varacanero@zeromail.org>
Date: Wed, 12 Feb 2014 16:26:59 +0100
Subject: moved check_mk server and client class to site_check_mk module

---
 puppet/modules/site_nagios/manifests/client.pp     | 22 ----------
 puppet/modules/site_nagios/manifests/init.pp       |  2 +-
 puppet/modules/site_nagios/manifests/server.pp     |  2 +-
 .../site_nagios/manifests/server/check_mk.pp       | 48 ----------------------
 4 files changed, 2 insertions(+), 72 deletions(-)
 delete mode 100644 puppet/modules/site_nagios/manifests/client.pp
 delete mode 100644 puppet/modules/site_nagios/manifests/server/check_mk.pp

(limited to 'puppet/modules/site_nagios')

diff --git a/puppet/modules/site_nagios/manifests/client.pp b/puppet/modules/site_nagios/manifests/client.pp
deleted file mode 100644
index ff569142..00000000
--- a/puppet/modules/site_nagios/manifests/client.pp
+++ /dev/null
@@ -1,22 +0,0 @@
-class site_nagios::client {
-
-  $ssh_hash = hiera('ssh')
-  $pubkey   = $ssh_hash['authorized_keys']['monitor']['key']
-  $type     = $ssh_hash['authorized_keys']['monitor']['type']
-
-  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_nagios/manifests/init.pp b/puppet/modules/site_nagios/manifests/init.pp
index c3cfa02e..eb08cdcb 100644
--- a/puppet/modules/site_nagios/manifests/init.pp
+++ b/puppet/modules/site_nagios/manifests/init.pp
@@ -1,6 +1,6 @@
 class site_nagios  {
   tag 'leap_service'
   Class['site_config::default'] -> Class['site_nagios']
-  
+
   include site_nagios::server
 }
diff --git a/puppet/modules/site_nagios/manifests/server.pp b/puppet/modules/site_nagios/manifests/server.pp
index d740d8b7..b1795826 100644
--- a/puppet/modules/site_nagios/manifests/server.pp
+++ b/puppet/modules/site_nagios/manifests/server.pp
@@ -46,6 +46,6 @@ class site_nagios::server inherits nagios::base {
   create_resources ( site_nagios::add_host, $hosts )
 
   include site_nagios::server::apache
-  include site_nagios::server::check_mk
+  include site_check_mk::server
   include site_shorewall::monitor
 }
diff --git a/puppet/modules/site_nagios/manifests/server/check_mk.pp b/puppet/modules/site_nagios/manifests/server/check_mk.pp
deleted file mode 100644
index f0fd3a76..00000000
--- a/puppet/modules/site_nagios/manifests/server/check_mk.pp
+++ /dev/null
@@ -1,48 +0,0 @@
-class site_nagios::server::check_mk {
-
-  $ssh_hash = hiera('ssh')
-  $pubkey   = $ssh_hash['authorized_keys']['monitor']['key']
-  $type     = $ssh_hash['authorized_keys']['monitor']['type']
-  $seckey   = $ssh_hash['monitor']['private_key']
-  $ssh_port = $ssh_hash['port']
-
-  $nagios_hiera   = hiera_hash('nagios')
-  $hosts          = $nagios_hiera['hosts']
-  $all_hosts = inline_template("<% @hosts.keys.sort.each do |key| -%>\"<%= key %>\", <% end -%>")
-
-  package { 'check-mk-server':
-    ensure => installed,
-  }
-
-  # override paths to use the system check_mk rather than OMD
-  class { 'check_mk::config':
-    site          => '',
-    etc_dir       => '/etc',
-    nagios_subdir => 'nagios3',
-    bin_dir       => '/usr/bin',
-    host_groups   => undef,
-    require       => Package['check-mk-server']
-  }
-
-  Exec['check_mk-reload'] -> Service['nagios']
-
-  file {
-    '/etc/check_mk/conf.d/use_ssh.mk':
-      content => template('site_check_mk/use_ssh.mk'),
-      notify  => Exec['check_mk-refresh'];
-    '/etc/check_mk/all_hosts_static':
-      content => $all_hosts,
-      notify  => Exec['check_mk-refresh'];
-    '/etc/check_mk/.ssh':
-      ensure => directory;
-    '/etc/check_mk/.ssh/id_rsa':
-      content => $seckey,
-      owner   => 'nagios',
-      mode    => '0600';
-    '/etc/check_mk/.ssh/id_rsa.pub':
-      content => "${type} ${pubkey} monitor",
-      owner   => 'nagios',
-      mode    => '0644';
-  }
-
-}
-- 
cgit v1.2.3