IRC-bot: use 'enable' for Debian

Since the service "disable" bug was fixed in the debian service provider
[1] in the puppet 2.6.2-5 package in squeeze, let's switch from the
manual calls to the "enable" feature.

[1]: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=573551

Also add a requirement between service[nagios-nsa] and
file[/etc/init.d/nagios-nsa]. This was ensured in Debian with the exec
that we're now replacing but didn't find its way through the
centosification.

1 files changed, 3 insertions, 12 deletions

diff --git a/manifests/irc_bot.pp b/manifests/irc_bot.pp
index 04bed58..494f0c3 100644
--- a/manifests/irc_bot.pp
+++ b/manifests/irc_bot.pp
@@ -57,7 +57,9 @@ class nagios::irc_bot {
     service { "nagios-nsa":
         ensure => "running",
         hasstatus => true,
+        enable => true,
         require => [File["/etc/nagios_nsa.cfg"],
+                    File["/etc/init.d/nagios-nsa"],
                     Package["libnet-irc-perl"],
                     Service['nagios'] ],
     }
@@ -65,18 +67,7 @@ class nagios::irc_bot {
     case $operatingsystem {
       centos: {
         Package['libnet-irc-perl']{
-          name => 'perl-Net-IRC',  
-        }
-        Service['nagios-nsa']{
-          enable => true,
-        }
-      }  
-      debian,ubuntu: {
-        exec { "nagios_nsa_init_script":
-          command => "/usr/sbin/update-rc.d nagios-nsa defaults",
-          unless => "/bin/ls /etc/rc3.d/ | /bin/grep nagios-nsa",
-          require => File["/etc/init.d/nagios-nsa"],
-          before => Service['nagios-nsa'],
+          name => 'perl-Net-IRC',
         }
       }
     }