summaryrefslogtreecommitdiff
path: root/templates
diff options
context:
space:
mode:
authorMicah Anderson <micah@riseup.net>2011-07-14 17:55:33 -0400
committerMicah Anderson <micah@riseup.net>2011-07-14 17:55:33 -0400
commit6ad1e288af0f8b6691aa6b57b2b23c44b06d4165 (patch)
tree3a127ba89ab98012ffc154380978389eedf3b2fd /templates
parentb0ca021364957715bb608d25ad47baed568f078a (diff)
parentdb9b47560068218125cfb82b0a19a491cffba002 (diff)
Merge remote-tracking branch 'remotes/lelutin/bot_fixes'
Conflicts: manifests/irc_bot.pp Had to merge in the use_notices change that we had in our branch
Diffstat (limited to 'templates')
-rw-r--r--templates/irc_bot/Debian/nagios-nsa.sh.erb5
1 files changed, 3 insertions, 2 deletions
diff --git a/templates/irc_bot/Debian/nagios-nsa.sh.erb b/templates/irc_bot/Debian/nagios-nsa.sh.erb
index 6e608db..c9d1966 100644
--- a/templates/irc_bot/Debian/nagios-nsa.sh.erb
+++ b/templates/irc_bot/Debian/nagios-nsa.sh.erb
@@ -2,8 +2,8 @@
### BEGIN INIT INFO
# Provides: nagios-nsa
-# Required-Start: $remote_fs $syslog $nagios
-# Required-Stop: $remote_fs $syslog $nagios
+# Required-Start: $remote_fs $syslog nagios3
+# Required-Stop: $remote_fs $syslog nagios3
# Default-Start: 2 3 4 5
# Default-Stop: 1 6 0
# Short-Description: Nagios Simple IRC Agent
@@ -51,6 +51,7 @@ cleanup() {
case $1
in
start)
+ cleanup
start
;;
stop)