diff options
| author | varac <varacanero@zeromail.org> | 2015-11-06 12:23:51 +0100 |
|---|---|---|
| committer | varac <varacanero@zeromail.org> | 2015-11-17 19:51:16 +0100 |
| commit | dc035701e86385e8593630230bb2a5bef7ddf0e6 (patch) | |
| tree | 15f199fa96d0c77bc5ed7fd15115fa02cac5e8e3 /puppet | |
| parent | 675f826d4a85c1cd26e30d0f8ef52d5b592c0d1c (diff) | |
[bug] fix check_mk on jessie
- Related: #6920
Diffstat (limited to 'puppet')
| -rw-r--r-- | puppet/modules/site_check_mk/manifests/server.pp | 13 | ||||
| -rw-r--r-- | puppet/modules/site_check_mk/templates/use_ssh.mk | 2 |
2 files changed, 14 insertions, 1 deletions
diff --git a/puppet/modules/site_check_mk/manifests/server.pp b/puppet/modules/site_check_mk/manifests/server.pp index 57f68d3e..0159a050 100644 --- a/puppet/modules/site_check_mk/manifests/server.pp +++ b/puppet/modules/site_check_mk/manifests/server.pp @@ -17,6 +17,19 @@ class site_check_mk::server { ensure => installed, } + # we don't use check-mk-multisite, and the jessie version + # of this config file breaks with apache 2.4 + # until https://gitlab.com/shared-puppet-modules-group/apache/issues/11 + # is not fixed, we need to use a generic file type here + #apache::config::global { 'check-mk-multisite.conf': + # ensure => absent + #} + + file { '/etc/apache2/conf-enabled/check-mk-multisite.conf': + ensure => absent, + require => Package['check-mk-server']; + } + # override paths to use the system check_mk rather than OMD class { 'check_mk::config': site => '', diff --git a/puppet/modules/site_check_mk/templates/use_ssh.mk b/puppet/modules/site_check_mk/templates/use_ssh.mk index 0bebebcf..55269536 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| %> +<% @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 -%> ] |