From e643fccca9a3913b88afdab736d0509a7d4eb85e Mon Sep 17 00:00:00 2001 From: Pascal Terjan Date: Mon, 25 Sep 2017 10:08:53 +0100 Subject: Update xymon hosts config file for Mageia >= 5 --- modules/xymon/manifests/server.pp | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) (limited to 'modules/xymon') diff --git a/modules/xymon/manifests/server.pp b/modules/xymon/manifests/server.pp index 37ca0731..dff50430 100644 --- a/modules/xymon/manifests/server.pp +++ b/modules/xymon/manifests/server.pp @@ -15,6 +15,21 @@ class xymon::server { notify => Exec['service xymon reload'], } + if versioncmp($::lsbdistrelease, '5') < 0 { + file { + # Define hosts and web view layout, and lists tests to be run against + # host by e.g. network tests from xymon server + '/etc/xymon/bb-hosts': + content => template('xymon/bb-hosts'); + } + } else { + file { + # Define hosts and web view layout, and lists tests to be run against + # host by e.g. network tests from xymon server + '/etc/xymon/hosts.cfg': + content => template('xymon/bb-hosts'); + } + } file { # Environment variables user by hobbitd,hobbitlaunch,hobbitd_rrd,CGIs # and bbgen (which generates the static html pages) @@ -24,11 +39,6 @@ class xymon::server { '/etc/xymon/hobbitserver.cfg': content => template('xymon/hobbitserver.cfg'); - # Define hosts and web view layout, and lists tests to be run against - # host by e.g. network tests from xymon server - '/etc/xymon/bb-hosts': - content => template('xymon/bb-hosts'); - # Defines thresholds for test data reported by clients, e.g. load # disk, procs, ports, memory, as well as those which require some # configuration server side to the client: files, msgs, -- cgit v1.2.1