From c09b1ece7e566ba9c9dbb985f9dfacbe3c2090ca Mon Sep 17 00:00:00 2001
From: Gardouille <gardouille@gmail.com>
Date: Wed, 11 Feb 2015 10:34:51 +0100
Subject: [PATCH] xymon::client::install : Install the Xymon client package.

---
 manifests/client.pp         |  8 +++++---
 manifests/client/install.pp | 16 ++++++++++++----
 manifests/params.pp         |  9 ++++++---
 3 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/manifests/client.pp b/manifests/client.pp
index 52055e0..b76b136 100644
--- a/manifests/client.pp
+++ b/manifests/client.pp
@@ -22,10 +22,12 @@
 # WTFPL <http://wtfpl.org/>
 #
 class xymon::client (
-  $download_dir               = $xymon::params::download_dir,
-  $download_url               = $xymon::params::download_url,
+  $download_dir               = $xymon::params::cli_download_dir,
+  $download_url               = $xymon::params::cli_download_url,
   $new_version                = $xymon::params::cli_new_version,
-  $package_name               = $xymon::params::package_name,
+  $package_name               = $xymon::params::cli_package_name,
+  $pkg_ensure                 = $xymon::params::cli_pkg_ensure,
+  $pkg_provider               = $xymon::params::cli_pkg_provider,
 ) inherits xymon::params {
 
   include '::xymon::client::preconfig'
diff --git a/manifests/client/install.pp b/manifests/client/install.pp
index 51ae347..8aed6ac 100644
--- a/manifests/client/install.pp
+++ b/manifests/client/install.pp
@@ -15,11 +15,19 @@ class xymon::client::install {
   }
   ->
   ## Package
-  # Download the latest Xymon package
+  # Download the latest Xymon client package
   exec { 'Download Xymon Client':
-    command  => "wget ${xymon::client::preconfig::dl_url}/${xymon::client::preconfig::pkg_name} -O ${xymon::client::preconfig::pkg_name}",
-    cwd      => "${xymon::client::download_dir}",
-    creates  => "${xymon::client::download_dir}/${xymon::client::preconfig::pkg_name}",
+    command => "wget ${xymon::client::preconfig::dl_url}/${xymon::client::preconfig::pkg_name} -O ${xymon::client::preconfig::pkg_name}",
+    cwd     => "${xymon::client::download_dir}",
+    creates => "${xymon::client::download_dir}/${xymon::client::preconfig::pkg_name}",
+  }
+  ->
+  # Install Xymon client package
+  package { 'xymon-client':
+    ensure   => "${xymon::client::pkg_ensure}",
+    provider => "${xymon::client::pkg_provider}",
+    source   => "${xymon::client::download_dir}/${xymon::client::preconfig::pkg_name}",
   }
 
+
 } # Private class: xymon::client::install
diff --git a/manifests/params.pp b/manifests/params.pp
index 39bf2d3..b2a2ce7 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -5,11 +5,14 @@ class xymon::params {
     'Debian': {
 
       # Client
-      $download_dir               = '/opt/xymon/packages'
+      $cli_download_dir           = '/opt/xymon/packages'
+      $cli_download_url           = undef
       $cli_new_version            = '4.3.17'
 
-      $package_name               = undef
-      $download_url               = undef
+      $cli_package_name           = undef
+      $cli_pkg_ensure             = 'present'
+      $cli_pkg_provider           = 'dpkg'
+
 
     }
     default: {