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

clarified: Removed dependency to ia32libs from recorder

Browse source
This commit is contained in:
Ossi Salmi 2013-06-04 15:44:11 +03:00
parent dd0d11df05
commit 1a445d019b
1 changed files with 8 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

18
clarified/manifests/init.pp
View file

@ -38,8 +38,6 @@ class clarified::analyzer {
# #
class clarified::recorder { class clarified::recorder {
include ia32libs
if !$clarified_recorder_package { if !$clarified_recorder_package {
if $clarified_recorder_package_latest { if $clarified_recorder_package_latest {
$clarified_recorder_package = $clarified_recorder_package_latest $clarified_recorder_package = $clarified_recorder_package_latest
@ -77,7 +75,7 @@ class clarified::recorder {
mode => "0644", mode => "0644",
owner => root, owner => root,
group => root, group => root,
before => Exec["/usr/local/src/clarified-recorder-linux-i686.sh"], before => Exec["/usr/local/src/clarified-recorder-linux.sh"],
} }
File["/etc/clarified/probe.d", "/etc/clarified/remote.d"] { File["/etc/clarified/probe.d", "/etc/clarified/remote.d"] {
@ -87,22 +85,22 @@ class clarified::recorder {
source => "puppet:///modules/custom/empty", source => "puppet:///modules/custom/empty",
} }
file { "/usr/local/src/clarified-recorder-linux-i686.sh": file { "/usr/local/src/clarified-recorder-linux.sh":
ensure => present, ensure => present,
mode => "0755", mode => "0755",
owner => root, owner => root,
group => root, group => root,
source => "puppet:///files/packages/${clarified_recorder_package}", source => "puppet:///files/packages/${clarified_recorder_package}",
before => Exec["/usr/local/src/clarified-recorder-linux-i686.sh"], before => Exec["/usr/local/src/clarified-recorder-linux.sh"],
} }
exec { "rm -f /usr/local/probe": exec { "rm -f /usr/local/probe":
path => "/bin:/usr/bin:/sbin:/usr/sbin", path => "/bin:/usr/bin:/sbin:/usr/sbin",
onlyif => "test -h /usr/local/probe", onlyif => "test -h /usr/local/probe",
subscribe => File["/usr/local/src/clarified-recorder-linux-i686.sh"], subscribe => File["/usr/local/src/clarified-recorder-linux.sh"],
before => Exec["/usr/local/src/clarified-recorder-linux-i686.sh"], before => Exec["/usr/local/src/clarified-recorder-linux.sh"],
refreshonly => true, refreshonly => true,
} }
exec { "/usr/local/src/clarified-recorder-linux-i686.sh": exec { "/usr/local/src/clarified-recorder-linux.sh":
creates => "/usr/local/probe", creates => "/usr/local/probe",
notify => Service["clarified-probe"], notify => Service["clarified-probe"],
} }
@ -111,7 +109,7 @@ class clarified::recorder {
path => "/bin:/usr/bin:/sbin:/usr/sbin", path => "/bin:/usr/bin:/sbin:/usr/sbin",
cwd => "/usr/local/probe", cwd => "/usr/local/probe",
command => "sed s:@PREFIX@:/usr/local/probe: clarified-functions.in > /etc/clarified/clarified-functions", command => "sed s:@PREFIX@:/usr/local/probe: clarified-functions.in > /etc/clarified/clarified-functions",
subscribe => Exec["/usr/local/src/clarified-recorder-linux-i686.sh"], subscribe => Exec["/usr/local/src/clarified-recorder-linux.sh"],
before => Service["clarified-probe"], before => Service["clarified-probe"],
refreshonly => true, refreshonly => true,
} }
@ -122,7 +120,7 @@ class clarified::recorder {
owner => root, owner => root,
group => root, group => root,
source => "/usr/local/probe/probe-init.sh", source => "/usr/local/probe/probe-init.sh",
require => Exec["/usr/local/src/clarified-recorder-linux-i686.sh"], require => Exec["/usr/local/src/clarified-recorder-linux.sh"],
before => Service["clarified-probe"], before => Service["clarified-probe"],
} }