From 7d6e6e57f1f12702a13c326bcae13406d424a509 Mon Sep 17 00:00:00 2001 From: Matt Taggart Date: Thu, 20 Jul 2017 13:01:26 -0700 Subject: create a check_mk::params and start using it --- manifests/server/configure_ssh.pp | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'manifests/server/configure_ssh.pp') diff --git a/manifests/server/configure_ssh.pp b/manifests/server/configure_ssh.pp index 987cc7a..29cf95b 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' -) { + $etc_dir = $check_mk::params::etc_dir, + $shelluser = $check_mk::params::shelluser, + $shellgroup = $check_mk::params::shellgroup, +) inherit 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'] } -- cgit v1.2.3 From cac46e3649d5f190c2e8c3933c5f9af8065ebf1d Mon Sep 17 00:00:00 2001 From: Matt Taggart Date: Fri, 21 Jul 2017 11:45:15 -0700 Subject: fix syntax errors --- manifests/server/configure_ssh.pp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'manifests/server/configure_ssh.pp') diff --git a/manifests/server/configure_ssh.pp b/manifests/server/configure_ssh.pp index 29cf95b..3b517f7 100644 --- a/manifests/server/configure_ssh.pp +++ b/manifests/server/configure_ssh.pp @@ -1,9 +1,9 @@ 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, -) inherit check_mk::params { +) inherits check_mk::params { # collect exported files from client::generate_sshkey File <<| tag == $check_mk_tag |>> -- cgit v1.2.3