From 5adaf4b474f01d0884e4130dcbd9ddfd1b7dcb92 Mon Sep 17 00:00:00 2001
From: varac <varacanero@zeromail.org>
Date: Thu, 25 Jul 2013 11:20:24 +0200
Subject: make shell user + group configurable, defaulting to monitoring

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

diff --git a/manifests/agent/generate_sshkey.pp b/manifests/agent/generate_sshkey.pp
index 58ce6fe..2084314 100644
--- a/manifests/agent/generate_sshkey.pp
+++ b/manifests/agent/generate_sshkey.pp
@@ -1,7 +1,7 @@
 define check_mk::agent::generate_sshkey(
   $ssh_key_basepath = '/etc/puppet/modules/keys/files/check_mk_keys',
-  $user             = 'monitoring',
-  $group            = 'monitoring',
+  $user             = $::check_mk::shelluser,
+  $group            = $::check_mk::shellgroup,
   $homedir          = '/omd/sites/monitoring',
   $check_mk_tag     = 'check_mk_sshkey'
 ){
diff --git a/manifests/init.pp b/manifests/init.pp
index 76946f5..999541d 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -8,7 +8,9 @@ class check_mk (
   $http_service_name    = 'httpd',
   $xinitd_service_name  = 'xinetd',
   $omdadmin_htpasswd    = undef,
-  $use_ssh              = false ) {
+  $use_ssh              = false,
+  $shelluser            = 'monitoring',
+  $shellgroup           = 'monitoring' ) {
 
   class { 'check_mk::install':
     filestore => $filestore,
-- 
cgit v1.2.3