summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2013-01-26overseen duplicate require'svarac
2013-01-26make sure the nagios server package is installed firstvarac
2013-01-25include nagios::nrpe::linux in nagios::nrpe::debianvarac
2013-01-25linted target.pp, added notesvarac
2013-01-25nrpe/debian: include debian class, service hasstatus => falsevarac
2013-01-25lintedvarac
2013-01-25adding Debian specific nrpe template (fixes stop/restart of nrpe-server)kwadronaut
2013-01-24remove stray % that arrived in this file through a merge conflictMicah Anderson
2013-01-24fix merge conflict mess-upMicah Anderson
2013-01-24indentation, use_nrpe worksvarac
2013-01-24Revert "naming PID and SOCKFILE absent broke things"varac
This reverts commit 02d2ca2df868262728c67c13d5dbf484c001d380.
2013-01-24Merge branch 'master' of ssh://code.leap.se/puppet_nagiosvarac
2013-01-24use_nrpe: boolean, defaults to falsevarac
2013-01-24naming PID and SOCKFILE absent broke thingskwadronaut
2013-01-24unquoted boolean variablevarac
2013-01-23remove extra %Micah Anderson
2013-01-23remove unnecessary additional %, this keeps coming back through merge conflictsMicah Anderson
2013-01-23Merge remote-tracking branch 'shared/master'Micah Anderson
Conflicts: README manifests/irc_bot.pp manifests/irc_bot/base.pp templates/irc_bot/nsa.cfg.erb
2013-01-23lint irc_bot/base.ppMicah Anderson
2013-01-23be sure to notify the service after the configuration file has changedMicah Anderson
2013-01-23switch to using 'group => 0' instead of 'group => root'Micah Anderson
2013-01-23minor template formatting fix that seemed to have gone missing in a conflict ↵Micah Anderson
merge
2013-01-03merge artifact left in one manifestGabriel Filion
Signed-off-by: Gabriel Filion <lelutin@gmail.com>
2013-01-02Merge remote-tracking branch 'shared/master'mh
Conflicts: README manifests/service.pp
2013-01-02this file is only needed on debianmh
2013-01-02trocla should be optionalmh
2013-01-02Merge remote-tracking branch 'riseup/master' into HEADmh
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
2012-11-24fix typomh
2012-11-23make check_domain configurablemh
2012-11-23export also the nagios host, so we can still use it remotemh
2012-11-23add new wrapper for dns hostsmh
2012-11-22added templates/nrpe/nrpe_command.erbnadir
2012-11-22Merge branch 'master' of git://labs.riseup.net/shared-nagiosvarac
Conflicts: templates/irc_bot/nsa.cfg.erb
2012-11-21add dns checkmh
2012-11-14we should then set a defaultmh
2012-11-14make it possible to not pass check_command if service should be absentmh
2012-09-26forgot $varac
2012-09-26fix proper deployment of pnp4nagios-templates.cfgvarac
2012-09-25fix variable names that weren't properly pulled in on mergeMicah Anderson
2012-09-25remove unnecessary % that came from immerda's branch, with it the following ↵Micah Anderson
errors are caused: Operator or semicolon missing before %Nsa at /etc/nagios_nsa.cfg line 1. Ambiguous use of % resolved as operator % at /etc/nagios_nsa.cfg line 1. ERROR: Failure compiling '/etc/nagios_nsa.cfg' - syntax error at /etc/nagios_nsa.cfg line 1, near "%%Nsa "
2012-09-25forgot $varac
2012-09-25fix proper deployment of pnp4nagios-templates.cfgvarac
2012-09-25Merge branch 'merge_immerda'Micah Anderson
Conflicts: manifests/apache.pp this conflict was just a indentation difference.
2012-09-20Merge remote-tracking branch 'riseup/irc_bot_enhancements'Gabriel Filion
2012-09-19Merge branch 'immerda'Leap devs
Conflicts: manifests/apache.pp manifests/irc_bot.pp manifests/service/mysql.pp templates/irc_bot/nsa.cfg.erb Conflict resolutions: apache.pp: just cosmetics mysql.pp: The shared modules provides more variables to fine tune the mysql health check so we went for this version. The irc bot conflicts were a result of immerda's branch not being up-to-date with the shared branch. The shared branch had factored out the irc_bot.pp into a directory, and added a few additional variables. Immerda changed the variables from having the prefix $nagios_ to not having it and did not have that refactor. The variable renames were good ones for the 2.7 refactoring work, and future hiera integration, so we want those. So to resolve this, we took the shared version of the refactor, and then took the immerda version of the variable renames. This requires an UPGRADE NOTICE in the README as people may have been using the previous variable names.
2012-09-19updated readmevarac
2012-09-19no ::nagios_packagename variable anymorevarac
2012-09-19require pnp4nagios package for config filevarac
2012-09-19use a graph style icon for action.gifvarac
2012-09-19typos againvarac