Fixed package handling in clarified module
This commit is contained in:
parent
ed87bf4941
commit
cdf3e834fa
1 changed files with 19 additions and 7 deletions
|
@ -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",
|
||||
}
|
||||
|
|
Loading…
Add table
Reference in a new issue