diff options
Diffstat (limited to 'modules/xymon/manifests')
| -rw-r--r-- | modules/xymon/manifests/client.pp | 10 | ||||
| -rw-r--r-- | modules/xymon/manifests/server.pp | 16 |
2 files changed, 11 insertions, 15 deletions
diff --git a/modules/xymon/manifests/client.pp b/modules/xymon/manifests/client.pp index 58d44257..cfde8134 100644 --- a/modules/xymon/manifests/client.pp +++ b/modules/xymon/manifests/client.pp @@ -1,17 +1,19 @@ class xymon::client { package { 'xymon-client': } - service { 'xymon-client': + $service = 'xymon' + + service { $service: hasstatus => false, - status => "$::lib_dir/xymon/client/runclient.sh status", + status => "${::lib_dir}/xymon/client/runclient.sh status", require => Package['xymon-client'], } - # TODO replace with a exported ressource + # TODO replace with a exported resource $server = extlookup('hobbit_server','x') file { '/etc/sysconfig/xymon-client': content => template('xymon/xymon-client'), - notify => Service['xymon-client'], + notify => Service[$service], require => Package['xymon-client'], } } diff --git a/modules/xymon/manifests/server.pp b/modules/xymon/manifests/server.pp index 223dab6b..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,6 +8,11 @@ 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 @@ -22,11 +21,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, |