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

Refactored abusehelper init, added support for $abusesa_botnets

Browse source
This commit is contained in:
Ossi Salmi 2013-03-07 14:21:18 +02:00
parent 7ba77ed2ea
commit 12791c5891
2 changed files with 60 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
abusehelper/manifests/init.pp
View file

@ -2,6 +2,9 @@
# #
# === Global variables # === Global variables
# #
# $abusehelper_datadir
# Abusehelper home directory. Defaults to /var/lib/ah2.
#
# $abusehelper_botnets # $abusehelper_botnets
# Array of botnet paths to start at boot. # Array of botnet paths to start at boot.
# #
@ -113,11 +116,25 @@ class abusehelper {
} }
} }
if $abusehelper_botnets {
include abusehelper::init
}
}
# Install abusehelper init script.
#
class abusehelper::init {
if !$abusehelper_botnets {
fail("Must define \$abusehelper_botnets")
}
if !$abusehelper_user { if !$abusehelper_user {
$abusehelper_user = "abusehel" $abusehelper_user = "abusehel"
} }
if $abusehelper_botnets {
file { "/etc/sysconfig/botnet": file { "/etc/sysconfig/botnet":
ensure => present, ensure => present,
name => $::operatingsystem ? { name => $::operatingsystem ? {
@ -154,6 +171,5 @@ class abusehelper {
service { "botnet": service { "botnet":
enable => true, enable => true,
} }
}
} }

9
abusesa/manifests/init.pp
View file

@ -5,6 +5,9 @@
# $abusesa_datadir # $abusesa_datadir
# AbuseSA home directory. Defaults to /var/lib/abusesa. # AbuseSA home directory. Defaults to /var/lib/abusesa.
# #
# $abusesa_botnets
# Array of botnet paths to start at boot.
#
class abusesa { class abusesa {
case $::operatingsystem { case $::operatingsystem {
@ -76,4 +79,10 @@ class abusesa {
} }
python::setup::install { "/usr/local/src/abusesa": } python::setup::install { "/usr/local/src/abusesa": }
if $abusesa_botnets {
$abusehelper_botnets = $abusesa_botnets
$abusehelper_user = "abusesa"
include abusehelper::init
}
} }