diff options
| author | mh <mh@immerda.ch> | 2013-01-02 17:51:29 +0100 |
|---|---|---|
| committer | mh <mh@immerda.ch> | 2013-01-02 17:51:29 +0100 |
| commit | 2b2268702938453bcece9ebe6070c03929910f8a (patch) | |
| tree | f7ddfdfaf2430b19dcb7f89b3c16ccf4321976de /templates | |
| parent | df358dcf15d26ba59b59f686ceee4b07b3aed7dd (diff) | |
| parent | a2a80093d42b7e9eec9d2af3c66138f7ceaf9ed6 (diff) | |
Merge remote-tracking branch 'riseup/master' into HEAD
Conflicts:
manifests/apache.pp
manifests/base.pp
manifests/defaults/templates.pp
manifests/defaults/vars.pp
manifests/init.pp
manifests/irc_bot.pp
manifests/nsca/client.pp
manifests/nsca/server.pp
manifests/service.pp
manifests/service/mysql.pp
templates/irc_bot/nsa.cfg.erb
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/irc_bot/Debian/nagios-nsa.sh.erb | 5 | ||||
| -rw-r--r-- | templates/irc_bot/nsa.cfg.erb | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/templates/irc_bot/Debian/nagios-nsa.sh.erb b/templates/irc_bot/Debian/nagios-nsa.sh.erb index 16fa2ea..43c0e79 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) diff --git a/templates/irc_bot/nsa.cfg.erb b/templates/irc_bot/nsa.cfg.erb index cc7d274..5dd7d0e 100644 --- a/templates/irc_bot/nsa.cfg.erb +++ b/templates/irc_bot/nsa.cfg.erb @@ -10,4 +10,6 @@ 'channel' => '<%= scope.lookupvar('nagios::irc_bot::nsa_channel') %>', 'pidfile' => '<%= scope.lookupvar('nagios::irc_bot::real_nsa_pidfile') %>', # set to undef to disable 'realname' => "<%= scope.lookupvar('nagios::irc_bot::nsa_realname') %>", + 'usenotices' => "<%= scope.lookupvar('nagios::irc_bot::nsa_usenotices') %>", + 'commandfile' => "<%= scope.lookupvar('nagios::irc_bot::real_nsa_commandfile') %>", ); |