tmakinen/puppet
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed package handling in clarified module

Browse source
This commit is contained in:
Ossi Salmi 2012-01-26 11:24:13 +02:00
parent ed87bf4941
commit cdf3e834fa
1 changed files with 19 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
clarified/manifests/init.pp
View file

@ -4,18 +4,24 @@ class clarified::analyzer {
include ia32libs 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": file { "/usr/local/src/clarified-analyzer-linux-i686.sh":
ensure => present, ensure => present,
mode => 0755, mode => 0755,
owner => root, owner => root,
group => root, group => root,
source => "puppet:///files/packages/clarified-analyzer-linux-i686.sh", source => "puppet:///files/packages/${clarified_analyzer_package}",
links => follow, before => Exec["/usr/local/src/clarified-analyzer-linux-i686.sh"],
} }
exec { "/usr/local/src/clarified-analyzer-linux-i686.sh": exec { "/usr/local/src/clarified-analyzer-linux-i686.sh":
creates => "/usr/local/clarified-analyzer", creates => "/usr/local/clarified-analyzer",
require => File["/usr/local/src/clarified-analyzer-linux-i686.sh"],
} }
} }
@ -27,6 +33,14 @@ class clarified::recorder {
include ia32libs 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 { if $recorder_datadir {
file { "${recorder_datadir}": file { "${recorder_datadir}":
ensure => directory, ensure => directory,
@ -71,11 +85,9 @@ class clarified::recorder {
mode => 0755, mode => 0755,
owner => root, owner => root,
group => root, group => root,
source => "puppet:///files/packages/clarified-recorder-linux-i686.sh", source => "puppet:///files/packages/${clarified_recorder_package}",
links => follow,
before => Exec["/usr/local/src/clarified-recorder-linux-i686.sh"], before => Exec["/usr/local/src/clarified-recorder-linux-i686.sh"],
} }
exec { "/usr/local/src/clarified-recorder-linux-i686.sh": exec { "/usr/local/src/clarified-recorder-linux-i686.sh":
creates => "/usr/local/probe", creates => "/usr/local/probe",
} }