| Age | Commit message (Collapse) | Author |
|---|
|
|
|
|
|
|
|
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
|
|
merge conflict due to immerda's branch not being up-to-date on the bot
|
|
Conflicts:
manifests/irc_bot.pp
Had to merge in the use_notices change that we had in our branch
|
|
This gives us the possibility of using the nagios::irc_bot::disable
class without having any config variable set. When using
nagios::irc_bot, we still get yelled at when we didn't define the
appropriate variables.
While we're moving the code around, change the group applied on the
different files from 'root' to '0' for better portability.
|
|
All classes serving the same purpose as this one are called 'disable',
so let's follow this standard.
|
|
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.
|
|
For when you need to ensure that the bot doesn't start on a server.
|
