Commit graph

6 commits

Author SHA1 Message Date
Nick Chappell
221db2b331 Squashed commit of the following:
commit 11075072f476dd857d190d26cdb1091e2a8cb6f4
Merge: ca583a8 8e24b03
Author: Nick Chappell <nick@intronic.org>
Date:   Thu Jan 29 21:20:21 2015 -0800

    Merge branch 'fix_apply_service_to_host_period' of https://github.com/arioch/puppet-icinga2 into arioch-fix_apply_service_to_host_period

commit 8e24b03958c50a36a8ceaab2ce89b8876d89f6ed
Author: Tom De Vylder <tom@penumbra.be>
Date:   Wed Jan 28 14:28:10 2015 +0100

    Fix undefined script variable error
2015-01-29 21:46:02 -08:00
Alexandre Beche
05f479d4f8 Fixing hash ordering in erb templates
Signed-off-by: Alexandre Beche <alexandre.beche@gmail.com>
2015-01-13 16:35:31 +01:00
Nick Chappell
633e4faef9 Use %> instead of -%> at the end of some ERB tags so that trailing whitespace isn't surpressed. Surpressing the trailing whitespace caused problems where there was one more parameters listed after each other. Each parameter would get squashed onto a single line, causing a syntax error when Icinga2 parsed the object file.
refs#7715: https://dev.icinga.org/issues/7715
2014-11-18 22:16:42 -08:00
Nick Chappell
6234216847 Change instances of 'enable_flap_detection' to 'enable_flapping'. This is a result of https://dev.icinga.org/issues/6870, which fixed the incorrect parameter name being used in the documentation.
refs# 7712 : https://dev.icinga.org/issues/7712
2014-11-17 21:37:06 -08:00
Nick Chappell
7de5eee88c Moved the check_command block to be before the vars block, since the vars block for a service apply will usually be setting variables for the check_command. 2014-07-31 09:25:39 -07:00
Nick Chappell
2b766285b2 Added an object defined type for applying services to hosts; also included an ERB template to render the object files. 2014-07-30 22:34:55 -07:00