summaryrefslogtreecommitdiff
path: root/puppet
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2016-06-07 11:41:04 +0200
committervarac <varacanero@zeromail.org>2016-06-07 11:41:04 +0200
commitd0ba04981366dd15e01cb89b970b01c18e8a4530 (patch)
tree1396bf04ee31aa40efdbb464b36612ded2c0b807 /puppet
parenta4034d0eee7e8627183c2a9d82f9cf5203ff9878 (diff)
parent5b2cb9a14bf5735e61e148c21496677c8458bd63 (diff)
Merge remote-tracking branch 'origin/0.8.x' into develop
Diffstat (limited to 'puppet')
-rw-r--r--puppet/modules/site_check_mk/templates/use_ssh.mk2
-rw-r--r--puppet/modules/site_config/manifests/default.pp3
2 files changed, 3 insertions, 2 deletions
diff --git a/puppet/modules/site_check_mk/templates/use_ssh.mk b/puppet/modules/site_check_mk/templates/use_ssh.mk
index 55269536..25f951e0 100644
--- a/puppet/modules/site_check_mk/templates/use_ssh.mk
+++ b/puppet/modules/site_check_mk/templates/use_ssh.mk
@@ -1,6 +1,6 @@
# http://mathias-kettner.de/checkmk_datasource_programs.html
datasource_programs = [
<% @nagios_hosts.sort.each do |name,config| %>
- ( "ssh -l root -i /etc/check_mk/.ssh/id_rsa -p <%=config['ssh_port']%> <%=config['domain_internal']%> check_mk_agent", [ "<%=config['domain_internal']%>" ], ),<%- end -%>
+ ( "ssh -o ConnectTimeout=5 -l root -i /etc/check_mk/.ssh/id_rsa -p <%=config['ssh_port']%> <%=config['domain_internal']%> check_mk_agent", [ "<%=config['domain_internal']%>" ], ),<%- end -%>
]
diff --git a/puppet/modules/site_config/manifests/default.pp b/puppet/modules/site_config/manifests/default.pp
index 256de1a1..9bc8c30d 100644
--- a/puppet/modules/site_config/manifests/default.pp
+++ b/puppet/modules/site_config/manifests/default.pp
@@ -7,8 +7,9 @@ class site_config::default {
include site_config::params
include site_config::setup
- # default class, used by all hosts
+ service { 'puppet': ensure => stopped }
+ # default class, used by all hosts
include lsb, git
# configure sysctl parameters