aboutsummaryrefslogtreecommitdiffstats
path: root/modules/xymon
diff options
context:
space:
mode:
authorPascal Terjan <pterjan@mageia.org>2017-09-25 10:08:53 +0100
committerPascal Terjan <pterjan@mageia.org>2017-09-25 10:09:11 +0100
commite643fccca9a3913b88afdab736d0509a7d4eb85e (patch)
treed1d2a9ca4e0675ba613ac12ece29106c3b504e0a /modules/xymon
parentc1d0362b05b78e00d9f005fb928cc55a0f7a78eb (diff)
downloadpuppet-e643fccca9a3913b88afdab736d0509a7d4eb85e.tar
puppet-e643fccca9a3913b88afdab736d0509a7d4eb85e.tar.gz
puppet-e643fccca9a3913b88afdab736d0509a7d4eb85e.tar.bz2
puppet-e643fccca9a3913b88afdab736d0509a7d4eb85e.tar.xz
puppet-e643fccca9a3913b88afdab736d0509a7d4eb85e.zip
Update xymon hosts config file for Mageia >= 5
Diffstat (limited to 'modules/xymon')
-rw-r--r--modules/xymon/manifests/server.pp20
1 files changed, 15 insertions, 5 deletions
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,