summaryrefslogtreecommitdiff
path: root/puppet
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2016-03-09 18:04:55 +0100
committervarac <varacanero@zeromail.org>2016-03-09 18:05:21 +0100
commitf8a54119d7b7b3a3e5042c4ed3bfd03ebb88a544 (patch)
tree3e20c270a677a28607c6a4a2a5d2dac6cb69b073 /puppet
parentbcd6bbeceee3fd4ad2082f46352d9f0813afa9ef (diff)
[bug] Adopt new parameters from nagios and check_mk module
Diffstat (limited to 'puppet')
-rw-r--r--puppet/modules/site_check_mk/manifests/agent.pp3
-rw-r--r--puppet/modules/site_nagios/manifests/server.pp2
2 files changed, 3 insertions, 2 deletions
diff --git a/puppet/modules/site_check_mk/manifests/agent.pp b/puppet/modules/site_check_mk/manifests/agent.pp
index 8d8ab814..b95d5d64 100644
--- a/puppet/modules/site_check_mk/manifests/agent.pp
+++ b/puppet/modules/site_check_mk/manifests/agent.pp
@@ -15,7 +15,8 @@ class site_check_mk::agent {
agent_package_name => 'check-mk-agent',
agent_logwatch_package_name => 'check-mk-agent-logwatch',
method => 'ssh',
- homedir => '/etc/nagios/check_mk',
+ authdir => '/root/.ssh',
+ authfile => 'authorized_keys',
register_agent => false,
require => Package['time']
} ->
diff --git a/puppet/modules/site_nagios/manifests/server.pp b/puppet/modules/site_nagios/manifests/server.pp
index bb3948c0..5939c82b 100644
--- a/puppet/modules/site_nagios/manifests/server.pp
+++ b/puppet/modules/site_nagios/manifests/server.pp
@@ -21,7 +21,7 @@ class site_nagios::server inherits nagios::base {
# it in site_apache::common
httpd => 'absent',
allow_external_cmd => true,
- stored_config => false,
+ storeconfigs => false,
}
# Delete nagios config files provided by packages