From cdf3e834fac91f19c139a4229211cc89a2f39e8c Mon Sep 17 00:00:00 2001
From: Ossi Salmi <osalmi@iki.fi>
Date: Thu, 26 Jan 2012 11:24:13 +0200
Subject: [PATCH] Fixed package handling in clarified module

---
 clarified/manifests/init.pp | 26 +++++++++++++++++++-------
 1 file changed, 19 insertions(+), 7 deletions(-)

diff --git a/clarified/manifests/init.pp b/clarified/manifests/init.pp
index 8bc4dd1..8fbb8d9 100644
--- a/clarified/manifests/init.pp
+++ b/clarified/manifests/init.pp
@@ -4,18 +4,24 @@ class clarified::analyzer {
 
     include ia32libs
 
+    if !$clarified_analyzer_package {
+        if $clarified_analyzer_package_latest {
+            $clarified_analyzer_package = $clarified_analyzer_package_latest
+        } else {
+            fail("Must define \$clarified_analyzer_package or \$clarified_analyzer_package_latest")
+        }
+    }
+
     file { "/usr/local/src/clarified-analyzer-linux-i686.sh":
         ensure => present,
         mode   => 0755,
         owner  => root,
         group  => root,
-        source => "puppet:///files/packages/clarified-analyzer-linux-i686.sh",
-        links  => follow,
+        source => "puppet:///files/packages/${clarified_analyzer_package}",
+        before => Exec["/usr/local/src/clarified-analyzer-linux-i686.sh"],
     }
-
     exec { "/usr/local/src/clarified-analyzer-linux-i686.sh":
         creates => "/usr/local/clarified-analyzer",
-        require => File["/usr/local/src/clarified-analyzer-linux-i686.sh"],
     }
 
 }
@@ -27,6 +33,14 @@ class clarified::recorder {
 
     include ia32libs
 
+    if !$clarified_recorder_package {
+        if $clarified_recorder_package_latest {
+            $clarified_recorder_package = $clarified_recorder_package_latest
+        } else {
+            fail("Must define \$clarified_recorder_package or \$clarified_recorder_package_latest")
+        }
+    }
+
     if $recorder_datadir {
         file { "${recorder_datadir}":
             ensure => directory,
@@ -71,11 +85,9 @@ class clarified::recorder {
         mode   => 0755,
         owner  => root,
         group  => root,
-        source => "puppet:///files/packages/clarified-recorder-linux-i686.sh",
-        links  => follow,
+        source => "puppet:///files/packages/${clarified_recorder_package}",
         before => Exec["/usr/local/src/clarified-recorder-linux-i686.sh"],
     }
-
     exec { "/usr/local/src/clarified-recorder-linux-i686.sh":
         creates => "/usr/local/probe",
     }