summaryrefslogtreecommitdiff
path: root/manifests/defaults/templates.pp
AgeCommit message (Collapse)Author
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-06-272.7 underscore rename: site-nagiosMicah Anderson
2012-06-05new style for 2.7mh
2012-04-18Fully qualify facter variables to suppress warningsChristian G. Warden
merge conflict due to immerda's branch not being up-to-date on the bot
2012-02-01Fully qualify facter variables to suppress warningsChristian G. Warden
2010-08-07remove unnecessary fileserver variable (#2460)mh
2010-07-01fix variable lookup and allow outside settingmh
2010-02-20remove the classification of the $nagios_cfgdir variable. this is theMicah Anderson
only location where specific classification is done, and this anomaly prohibits you from setting the variable in site.pp
2009-12-02fix cfgdir variable scopeJerome Charaoui
2009-12-02move nagios templates in a file resource as puppet doesn't support them ↵Jerome Charaoui
using native types, see issue #1180