diff --git a/abusehelper/manifests/init.pp b/abusehelper/manifests/init.pp index 4bf979e..bc10ba4 100644 --- a/abusehelper/manifests/init.pp +++ b/abusehelper/manifests/init.pp @@ -2,6 +2,9 @@ # # === Global variables # +# $abusehelper_datadir +# Abusehelper home directory. Defaults to /var/lib/ah2. +# # $abusehelper_botnets # Array of botnet paths to start at boot. # @@ -113,47 +116,60 @@ 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 { $abusehelper_user = "abusehel" } - if $abusehelper_botnets { - file { "/etc/sysconfig/botnet": - ensure => present, - name => $::operatingsystem ? { - "debian" => "/etc/default/botnet", - "ubuntu" => "/etc/default/botnet", - default => "/etc/sysconfig/botnet", - }, - mode => "0644", - owner => "root", - group => "root", - content => template("abusehelper/botnet.sysconfig.erb"), - before => Service["botnet"], - } + file { "/etc/sysconfig/botnet": + ensure => present, + name => $::operatingsystem ? { + "debian" => "/etc/default/botnet", + "ubuntu" => "/etc/default/botnet", + default => "/etc/sysconfig/botnet", + }, + mode => "0644", + owner => "root", + group => "root", + content => template("abusehelper/botnet.sysconfig.erb"), + before => Service["botnet"], + } - file { "/etc/init.d/botnet": - ensure => present, - mode => "0755", - owner => "root", - group => "root", - source => "puppet:///modules/abusehelper/botnet.init", - notify => Exec["add-service-botnet"], - } - exec { "add-service-botnet": - path => "/bin:/usr/bin:/sbin:/usr/sbin", - command => $::operatingsystem ? { - "debian" => "update-rc.d botnet defaults", - "ubuntu" => "update-rc.d botnet defaults", - default => "chkconfig --add botnet", - }, - refreshonly => true, - before => Service["botnet"], - } + file { "/etc/init.d/botnet": + ensure => present, + mode => "0755", + owner => "root", + group => "root", + source => "puppet:///modules/abusehelper/botnet.init", + notify => Exec["add-service-botnet"], + } + exec { "add-service-botnet": + path => "/bin:/usr/bin:/sbin:/usr/sbin", + command => $::operatingsystem ? { + "debian" => "update-rc.d botnet defaults", + "ubuntu" => "update-rc.d botnet defaults", + default => "chkconfig --add botnet", + }, + refreshonly => true, + before => Service["botnet"], + } - service { "botnet": - enable => true, - } + service { "botnet": + enable => true, } } diff --git a/abusesa/manifests/init.pp b/abusesa/manifests/init.pp index 0d4a327..4ad416c 100644 --- a/abusesa/manifests/init.pp +++ b/abusesa/manifests/init.pp @@ -5,6 +5,9 @@ # $abusesa_datadir # AbuseSA home directory. Defaults to /var/lib/abusesa. # +# $abusesa_botnets +# Array of botnet paths to start at boot. +# class abusesa { case $::operatingsystem { @@ -76,4 +79,10 @@ class abusesa { } python::setup::install { "/usr/local/src/abusesa": } + if $abusesa_botnets { + $abusehelper_botnets = $abusesa_botnets + $abusehelper_user = "abusesa" + include abusehelper::init + } + }