From cf86b4c652676dee3e6283644fa4fa2b05a7cfe7 Mon Sep 17 00:00:00 2001
From: Ossi Salmi <osalmi@iki.fi>
Date: Mon, 4 Feb 2013 15:01:00 +0200
Subject: [PATCH] Properly enable botnet service

---
 abusehelper/manifests/init.pp | 28 ++++++++++++++++++++--------
 1 file changed, 20 insertions(+), 8 deletions(-)

diff --git a/abusehelper/manifests/init.pp b/abusehelper/manifests/init.pp
index 11a6626..2db1f5d 100644
--- a/abusehelper/manifests/init.pp
+++ b/abusehelper/manifests/init.pp
@@ -118,14 +118,6 @@ class abusehelper {
     }
 
     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":
             ensure  => present,
             name    => $::operatingsystem ? {
@@ -139,6 +131,26 @@ class abusehelper {
             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"],
+        }
+
         service { "botnet":
             enable => true,
         }