aboutsummaryrefslogtreecommitdiffstats
path: root/modules/xymon/manifests/server.pp
diff options
context:
space:
mode:
Diffstat (limited to 'modules/xymon/manifests/server.pp')
-rw-r--r--modules/xymon/manifests/server.pp29
1 files changed, 14 insertions, 15 deletions
diff --git a/modules/xymon/manifests/server.pp b/modules/xymon/manifests/server.pp
index 00a2bf23..b6c269cf 100644
--- a/modules/xymon/manifests/server.pp
+++ b/modules/xymon/manifests/server.pp
@@ -1,12 +1,6 @@
class xymon::server {
package { ['xymon','fping']: }
- service { 'xymon':
- hasstatus => false,
- status => "su xymon -c '$::lib_dir/xymon/server/hobbit.sh status'",
- require => Package['xymon'],
- }
-
File {
group => 'xymon',
require => Package['xymon'],
@@ -14,27 +8,32 @@ class xymon::server {
}
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');
+
# Environment variables user by hobbitd,hobbitlaunch,hobbitd_rrd,CGIs
# and bbgen (which generates the static html pages)
# hobbitlaunch (started by init script) may need to be restarted for
# changes here, for hobbitd_rrd (e.g. TEST2RRD), it is sufficient to
# kill hobbitd_rrd, hobbitlaunch will respawn it
- '/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');
+ '/etc/xymon/hobbitserver.cfg':
+ content => template('xymon/hobbitserver.cfg');
# 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,
- '/etc/xymon/hobbit-clients.cfg': content => template('xymon/hobbit-clients.cfg');
+ # configuration server side to the client: files, msgs,
+ '/etc/xymon/hobbit-clients.cfg':
+ content => template('xymon/hobbit-clients.cfg');
# Configuration for the xymon clients, which log files to process etc.
- '/etc/xymon/client-local.cfg': content => template('xymon/client-local.cfg');
+ '/etc/xymon/client-local.cfg':
+ content => template('xymon/client-local.cfg');
# Used for alerting, changes should be taken into effect immediately
- '/etc/xymon/hobbit-alerts.cfg': content => template('xymon/hobbit-alerts.cfg');
+ '/etc/xymon/hobbit-alerts.cfg':
+ content => template('xymon/hobbit-alerts.cfg');
}
# Most changes should take effect immediately, but sometimes threshold