summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2013-02-14Merge branch 'add_pnp4nagios' of ssh://code.leap.se/puppet_nagios into ↵Micah Anderson
add_pnp4nagios Conflicts: README.pnp4nagios manifests/defaults/pnp4nagios.pp manifests/pnp4nagios.pp manifests/pnp4nagios/popup.pp
2013-02-14move all pnp4nagios stuff into README.pnp4nagiosMicah Anderson
remove line that says that there are no packages (there are now)
2013-02-14Revert "added icon for pnp4nagios"Micah Anderson
This reverts commit 2f8d046607ad0bd5555ef812880cd97431b24977. This was never used in any resource
2013-02-14make site_nagios source primary, but allow fall-back to site-nagiosMicah Anderson
2013-02-14lintian of pnp4nagios commitsMicah Anderson
2013-02-14forgot $varac
2013-02-14fix proper deployment of pnp4nagios-templates.cfgvarac
2013-02-14updated readmevarac
2013-02-14no ::nagios_packagename variable anymorevarac
2013-02-14require pnp4nagios package for config filevarac
2013-02-14use a graph style icon for action.gifvarac
2013-02-14typos againvarac
2013-02-14typovarac
2013-02-14fixed conf file permissions, notify servicesvarac
2013-02-14resolve nagios_cfgdir variablevarac
2013-02-14depend on pnp4nagios instead of npcdvarac
2013-02-14configure pnp4nagios npcdvarac
2013-02-14typovarac
2013-02-14package pnp4nagios available now, fix permissions for config filesvarac
2013-02-14corrected path to pnp4nagios apache.confvarac
2013-02-14README.pnp4nagiosvarac
2013-02-14added icon for pnp4nagiosnadir
2013-02-14added pnp-grapher templates for explicit usenadir
2013-02-14added pnp-grapher templates for explicit usenadir
2013-02-14standard pnp4nagios apache confignadir
2013-02-14possibility to deploy a custom pnp4nagios apache confignadir
2013-02-14basic pnp4nagios grapher integrationvarac
2013-02-08Merge remote-tracking branch 'riseup/master'Gabriel Filion
2013-01-24remove stray % that arrived in this file through a merge conflictMicah Anderson
2013-01-23remove unnecessary additional %, this keeps coming back through merge conflictsMicah Anderson
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-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-20Merge remote-tracking branch 'riseup/irc_bot_enhancements'Gabriel Filion
2012-09-19updated readmevarac