summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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
2012-09-19typovarac
2012-09-19fixed conf file permissions, notify servicesvarac
2012-09-19resolve nagios_cfgdir variablevarac
2012-09-19depend on pnp4nagios instead of npcdvarac
2012-09-19configure pnp4nagios npcdvarac
2012-09-19typovarac
2012-09-19package pnp4nagios available now, fix permissions for config filesvarac
2012-09-19corrected path to pnp4nagios apache.confvarac
2012-09-19README.pnp4nagiosvarac
2012-09-19added icon for pnp4nagiosnadir
2012-09-19added pnp-grapher templates for explicit usenadir
2012-09-19added pnp-grapher templates for explicit usenadir
2012-09-19standard pnp4nagios apache confignadir
2012-09-19possibility to deploy a custom pnp4nagios apache confignadir
2012-09-19basic pnp4nagios grapher integrationvarac
2012-09-18updated readmevarac
2012-09-18no ::nagios_packagename variable anymorevarac
2012-09-18check_openvpn_server.plvarac
2012-09-18require pnp4nagios package for config filevarac
2012-09-17use a graph style icon for action.gifvarac
2012-09-17typos againvarac
2012-09-17typovarac
2012-09-17fixed conf file permissions, notify servicesvarac
2012-09-17resolve nagios_cfgdir variablevarac
2012-09-17depend on pnp4nagios instead of npcdvarac
2012-09-17configure pnp4nagios npcdvarac
2012-09-17typovarac
2012-09-17package pnp4nagios available now, fix permissions for config filesvarac
2012-09-17corrected path to pnp4nagios apache.confvarac
2012-09-17README.pnp4nagiosvarac
2012-09-17added icon for pnp4nagiosnadir
2012-09-17added pnp-grapher templates for explicit usenadir
2012-09-17added pnp-grapher templates for explicit usenadir
2012-09-17standard pnp4nagios apache confignadir
2012-09-17possibility to deploy a custom pnp4nagios apache confignadir
2012-09-17basic pnp4nagios grapher integrationvarac
2012-09-10apache.conf: fixing file sourcevarac
2012-09-10exec calls: path to binary is neededvarac