moved check_mk server and client class to site_check_mk module

5 files changed, 8 insertions, 6 deletions

diff --git a/puppet/modules/site_nagios/manifests/client.pp b/puppet/modules/site_check_mk/manifests/client.pp
index ff569142..ae269168 100644
--- a/puppet/modules/site_nagios/manifests/client.pp
+++ b/puppet/modules/site_check_mk/manifests/client.pp
@@ -1,9 +1,11 @@
-class site_nagios::client {
+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',
diff --git a/puppet/modules/site_nagios/manifests/server/check_mk.pp b/puppet/modules/site_check_mk/manifests/server.pp
index f0fd3a76..625fc688 100644
--- a/puppet/modules/site_nagios/manifests/server/check_mk.pp
+++ b/puppet/modules/site_check_mk/manifests/server.pp
@@ -1,4 +1,4 @@
-class site_nagios::server::check_mk {
+class site_check_mk::server {
 
   $ssh_hash = hiera('ssh')
   $pubkey   = $ssh_hash['authorized_keys']['monitor']['key']
@@ -44,5 +44,5 @@ class site_nagios::server::check_mk {
       owner   => 'nagios',
       mode    => '0644';
   }
-
+  include check_mk::agent::local_checks
 }
diff --git a/puppet/modules/site_config/manifests/default.pp b/puppet/modules/site_config/manifests/default.pp
index a09a30d2..25f9b3f8 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_nagios::client
+  include site_check_mk::client
 }
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
 }