split xymon::server in a separate class too

2 files changed, 46 insertions, 46 deletions

diff --git a/modules/xymon/manifests/init.pp b/modules/xymon/manifests/init.pp
index 657fc0fb..9b609048 100644
--- a/modules/xymon/manifests/init.pp
+++ b/modules/xymon/manifests/init.pp
@@ -1,48 +1,2 @@
 class xymon {
-    class server {
-        package { ["xymon","fping"]: }
-
-        service { xymon:
-            hasstatus => false,
-            status => "su xymon -c '/usr/lib64/xymon/server/hobbit.sh status'",
-            require => Package['xymon'],
-        }
-
-        File {
-            group => xymon,
-            require => Package["xymon"],
-            notify => Exec["service xymon reload"],
-        }
-
-        file {
-            # 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");
-
-            # 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 for the xymon clients, which log files to process etc.
-            '/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");
-        }
-
-        # Most changes should take effect immediately, but sometimes threshold
-        # changes take effect sooner if hobbit is HUPd
-        exec { "service xymon reload":
-            refreshonly => true,
-            require => Package["xymon"],
-        }
-    }
 }
diff --git a/modules/xymon/manifests/server.pp b/modules/xymon/manifests/server.pp
new file mode 100644
index 00000000..00a2bf23
--- /dev/null
+++ b/modules/xymon/manifests/server.pp
@@ -0,0 +1,46 @@
+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'],
+        notify  => Exec['service xymon reload'],
+    }
+
+    file {
+        # 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');
+
+        # 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 for the xymon clients, which log files to process etc.
+        '/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');
+    }
+
+    # Most changes should take effect immediately, but sometimes threshold
+    # changes take effect sooner if hobbit is HUPd
+    exec { 'service xymon reload':
+        refreshonly => true,
+        require     => Package['xymon'],
+    }
+}