Properly enable botnet service

This commit is contained in:
Ossi Salmi 2013-02-04 15:01:00 +02:00
parent 603df85cea
commit cf86b4c652

View file

@ -118,14 +118,6 @@ class abusehelper {
} }
if $abusehelper_botnets { if $abusehelper_botnets {
file { "/etc/init.d/botnet":
ensure => present,
mode => "0755",
owner => "root",
group => "root",
source => "puppet:///modules/abusehelper/botnet.init",
before => Service["botnet"],
}
file { "/etc/sysconfig/botnet": file { "/etc/sysconfig/botnet":
ensure => present, ensure => present,
name => $::operatingsystem ? { name => $::operatingsystem ? {
@ -139,6 +131,26 @@ class abusehelper {
content => template("abusehelper/botnet.sysconfig.erb"), content => template("abusehelper/botnet.sysconfig.erb"),
before => Service["botnet"], 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": service { "botnet":
enable => true, enable => true,
} }