abusesa::recorder: Add parameter to disable services management
This commit is contained in:
parent
e23c67c8f3
commit
7afc1a3569
1 changed files with 45 additions and 31 deletions
|
@ -135,6 +135,9 @@ class abusesa::recorder(
|
|||
# $remote:
|
||||
# Enable remote. Defaults to true.
|
||||
#
|
||||
# $services:
|
||||
# Manage probe and remote services. Defaults to true.
|
||||
#
|
||||
# === Sample usage
|
||||
#
|
||||
# abusesa::recorder::interface { 'eth0':
|
||||
|
@ -156,6 +159,7 @@ define abusesa::recorder::interface(
|
|||
$remoteopt='',
|
||||
$probe=true,
|
||||
$remote=true,
|
||||
$services=true,
|
||||
) {
|
||||
|
||||
Class['abusesa::recorder'] -> Abusesa::Recorder::Interface[$name]
|
||||
|
@ -173,6 +177,12 @@ define abusesa::recorder::interface(
|
|||
group => 'root',
|
||||
}
|
||||
|
||||
if $probe == true and $services == true {
|
||||
$probe_notify = Service["probe-${name}"]
|
||||
} else {
|
||||
$probe_notify = undef
|
||||
}
|
||||
|
||||
file { "/etc/abusesa/probe.d/${name}":
|
||||
ensure => $probe ? {
|
||||
true => present,
|
||||
|
@ -183,12 +193,10 @@ define abusesa::recorder::interface(
|
|||
group => 'root',
|
||||
content => template('abusesa/recorder/probe.erb'),
|
||||
require => File["/var/lib/recorder/${name}"],
|
||||
notify => $probe ? {
|
||||
true => Service["probe-${name}"],
|
||||
false => undef,
|
||||
},
|
||||
notify => $probe_notify,
|
||||
}
|
||||
|
||||
if $services == true {
|
||||
service { "probe-${name}":
|
||||
ensure => $probe ? {
|
||||
true => running,
|
||||
|
@ -201,6 +209,13 @@ define abusesa::recorder::interface(
|
|||
status => "pgrep -f /var/run/probe/${name}.pid",
|
||||
subscribe => Exec['/usr/local/src/abusesa-recorder-linux.sh'],
|
||||
}
|
||||
}
|
||||
|
||||
if $remote == true and $services == true {
|
||||
$remote_notify = Service["remote-${name}"]
|
||||
} else {
|
||||
$remote_notify = undef
|
||||
}
|
||||
|
||||
file { "/etc/abusesa/remote.d/${name}":
|
||||
ensure => $remote ? {
|
||||
|
@ -212,12 +227,10 @@ define abusesa::recorder::interface(
|
|||
group => 'root',
|
||||
content => template('abusesa/recorder/remote.erb'),
|
||||
require => File["/var/lib/recorder/${name}"],
|
||||
notify => $remote ? {
|
||||
true => Service["remote-${name}"],
|
||||
false => undef,
|
||||
},
|
||||
notify => $remote_notify,
|
||||
}
|
||||
|
||||
if $services == true {
|
||||
service { "remote-${name}":
|
||||
ensure => $remote ? {
|
||||
true => running,
|
||||
|
@ -231,5 +244,6 @@ define abusesa::recorder::interface(
|
|||
require => Service["probe-${name}"],
|
||||
subscribe => Exec['/usr/local/src/abusesa-recorder-linux.sh'],
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
|
Loading…
Add table
Reference in a new issue