Merge remote-tracking branch 'riseup/master'

1 files changed, 14 insertions, 10 deletions

diff --git a/manifests/irc_bot/base.pp b/manifests/irc_bot/base.pp
index 5014bcb..fff9da4 100644
--- a/manifests/irc_bot/base.pp
+++ b/manifests/irc_bot/base.pp
@@ -2,30 +2,34 @@ class nagios::irc_bot::base {
   file {
     '/usr/local/bin/riseup-nagios-client.pl':
       source => 'puppet:///modules/nagios/irc_bot/riseup-nagios-client.pl',
-      owner => root, group => root, mode => 0755;
+      owner  => root, group => 0, mode => '0755';
+
     '/usr/local/bin/riseup-nagios-server.pl':
       source => 'puppet:///modules/nagios/irc_bot/riseup-nagios-server.pl',
-      owner => root, group => root, mode => 0755;
+      owner  => root, group => 0, mode => '0755';
+
     '/etc/init.d/nagios-nsa':
       content => template("nagios/irc_bot/${::operatingsystem}/nagios-nsa.sh.erb"),
       require => File['/usr/local/bin/riseup-nagios-server.pl'],
-      owner => root, group => root, mode => 0755;
+      owner   => root, group => 0, mode => '0755';
+
     '/etc/nagios_nsa.cfg':
-      ensure => present,
+      ensure  => present,
       content => template('nagios/irc_bot/nsa.cfg.erb'),
-      owner => nagios, group => root, mode => 0400;
+      owner   => nagios, group => 0, mode => '0400',
+      notify  => Service['nagios-nsa'];
   }
 
   package { 'libnet-irc-perl':
     ensure => present,
   }
 
-  service { "nagios-nsa":
-    ensure => "running",
+  service { 'nagios-nsa':
+    ensure    => 'running',
     hasstatus => true,
-    require => [ File["/etc/nagios_nsa.cfg"],
-                 Package["libnet-irc-perl"],
-                 Service['nagios'] ],
+    require   => [ File['/etc/nagios_nsa.cfg'],
+                   Package['libnet-irc-perl'],
+                   Service['nagios'] ],
   }
 
   nagios_command {