diff options
Diffstat (limited to 'manifests/server')
| -rw-r--r-- | manifests/server/collect_ps.pp | 4 | ||||
| -rw-r--r-- | manifests/server/configure_ssh.pp | 13 |
2 files changed, 10 insertions, 7 deletions
diff --git a/manifests/server/collect_ps.pp b/manifests/server/collect_ps.pp index 067a25c..5b8456c 100644 --- a/manifests/server/collect_ps.pp +++ b/manifests/server/collect_ps.pp @@ -1,6 +1,6 @@ class check_mk::server::collect_ps ( - $config = "${::check_mk::config::etc_dir}/check_mk/conf.d/ps.mk" -) { + $config = "${check_mk::config::etc_dir}/check_mk/conf.d/ps.mk" +) inherits check_mk::params { # this class gets run on the check-mk server in order to collect the # stored configs created on clients and assemble the ps.mk config file diff --git a/manifests/server/configure_ssh.pp b/manifests/server/configure_ssh.pp index 987cc7a..3b517f7 100644 --- a/manifests/server/configure_ssh.pp +++ b/manifests/server/configure_ssh.pp @@ -1,15 +1,18 @@ class check_mk::server::configure_ssh ( - $check_mk_tag = 'check_mk_sshkey' -) { + $check_mk_tag = 'check_mk_sshkey', + $etc_dir = $check_mk::params::etc_dir, + $shelluser = $check_mk::params::shelluser, + $shellgroup = $check_mk::params::shellgroup, +) inherits check_mk::params { # collect exported files from client::generate_sshkey File <<| tag == $check_mk_tag |>> # configure ssh access to agents which have 'ssh' tags - file { "${check_mk::config::etc_dir}/check_mk/conf.d/use_ssh.mk": + file { "${etc_dir}/check_mk/conf.d/use_ssh.mk": source => [ 'puppet:///modules/site_check_mk/use_ssh.mk', 'puppet:///modules/check_mk/use_ssh.mk' ], - owner => $::check_mk::shelluser, - group => $::check_mk::shellgroup, + owner => $shelluser, + group => $shellgroup, mode => '0644', notify => Exec['check_mk-refresh'] } |