From 05139ba68106f3780bc6e571d540f5d40a848278 Mon Sep 17 00:00:00 2001
From: Matt Taggart <taggart@riseup.net>
Date: Tue, 14 Jan 2014 13:32:52 -0800
Subject: mentions this clone's home

---
 README.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/README.md b/README.md
index 440b471..6c6fb18 100644
--- a/README.md
+++ b/README.md
@@ -201,3 +201,7 @@ You can also include host tags - for example:
       'host2.domain|windows|prod',
 
 Remember to run the Puppet agent on your monitoring host to pick up any changes.
+
+This is the riseup clone, available at:
+
+git://labs.riseup.net/module_check_mk
-- 
cgit v1.2.3


From 66509ce468ce9af7f79fa5235aeae6c49200e622 Mon Sep 17 00:00:00 2001
From: Matt Taggart <taggart@riseup.net>
Date: Fri, 17 Jan 2014 13:32:55 -0800
Subject: make variable parameters so we can override them

---
 manifests/config.pp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/manifests/config.pp b/manifests/config.pp
index 73e4882..f2f0edc 100644
--- a/manifests/config.pp
+++ b/manifests/config.pp
@@ -1,9 +1,9 @@
 class check_mk::config (
   $site,
   $host_groups = undef,
-) {
-  $etc_dir = "/omd/sites/${site}/etc"
+  $etc_dir = "/omd/sites/${site}/etc",
   $bin_dir = "/omd/sites/${site}/bin"
+) {
   file { "${etc_dir}/nagios/local":
     ensure => directory,
   }
-- 
cgit v1.2.3


From 4ac1f1b59647d14822954be54e9a2f3fc9cd54e2 Mon Sep 17 00:00:00 2001
From: Matt Taggart <taggart@riseup.net>
Date: Fri, 17 Jan 2014 13:52:12 -0800
Subject: disable service dependency

---
 manifests/config.pp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/manifests/config.pp b/manifests/config.pp
index f2f0edc..fdc3f1b 100644
--- a/manifests/config.pp
+++ b/manifests/config.pp
@@ -12,13 +12,13 @@ class check_mk::config (
     line    => "cfg_dir=${etc_dir}/nagios/local",
     path    => "${etc_dir}/nagios/nagios.cfg",
     require => File["${etc_dir}/nagios/local"],
-    notify  => Class['check_mk::service'],
+    #notify  => Class['check_mk::service'],
   }
   file_line { 'add-guest-users':
     ensure => present,
     line   => 'guest_users = [ "guest" ]',
     path   => "${etc_dir}/check_mk/multisite.mk",
-    notify => Class['check_mk::service'],
+    #notify => Class['check_mk::service'],
   }
   concat { "${etc_dir}/check_mk/main.mk":
     owner  => 'root',
-- 
cgit v1.2.3


From 84e745a6d6ce6529e451305cbf7a67618390d875 Mon Sep 17 00:00:00 2001
From: Matt Taggart <taggart@riseup.net>
Date: Fri, 17 Jan 2014 14:49:51 -0800
Subject: pass the homedir parameter down from check_mk::agent so we can
 override it

---
 manifests/agent.pp                 | 2 ++
 manifests/agent/config.pp          | 5 ++++-
 manifests/agent/generate_sshkey.pp | 2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/manifests/agent.pp b/manifests/agent.pp
index c6e59ad..24f69bd 100644
--- a/manifests/agent.pp
+++ b/manifests/agent.pp
@@ -4,6 +4,7 @@ class check_mk::agent (
   $ip_whitelist = undef,
   $port         = '6556',
   $server_dir   = '/usr/bin',
+  $homedir      = '/omd/sites/monitoring',
   $use_cache    = false,
   $user         = 'root',
   $version      = undef,
@@ -37,6 +38,7 @@ class check_mk::agent (
     ip_whitelist => $ip_whitelist,
     port         => $port,
     server_dir   => $server_dir,
+    homedir      => $homedir,
     use_cache    => $use_cache,
     user         => $user,
     use_ssh      => $use_ssh,
diff --git a/manifests/agent/config.pp b/manifests/agent/config.pp
index 82636f5..5b9323a 100644
--- a/manifests/agent/config.pp
+++ b/manifests/agent/config.pp
@@ -2,6 +2,7 @@ class check_mk::agent::config (
   $ip_whitelist = '',
   $port,
   $server_dir,
+  $homedir,
   $use_cache,
   $user,
   $use_ssh = false
@@ -14,7 +15,9 @@ class check_mk::agent::config (
   }
 
   if ( $use_ssh == true ){
-    check_mk::agent::generate_sshkey { 'check_mk_key': }
+    check_mk::agent::generate_sshkey { 'check_mk_key':
+      homedir => $homedir
+    }
   } else {
 
     if $ip_whitelist {
diff --git a/manifests/agent/generate_sshkey.pp b/manifests/agent/generate_sshkey.pp
index 58ce6fe..3187037 100644
--- a/manifests/agent/generate_sshkey.pp
+++ b/manifests/agent/generate_sshkey.pp
@@ -2,7 +2,7 @@ define check_mk::agent::generate_sshkey(
   $ssh_key_basepath = '/etc/puppet/modules/keys/files/check_mk_keys',
   $user             = 'monitoring',
   $group            = 'monitoring',
-  $homedir          = '/omd/sites/monitoring',
+  $homedir,
   $check_mk_tag     = 'check_mk_sshkey'
 ){
 
-- 
cgit v1.2.3