From 0fddb46b6830c5c831dc0463f49766e569f942ce Mon Sep 17 00:00:00 2001 From: Gunnar Beutner Date: Tue, 1 Apr 2014 10:22:52 +0200 Subject: [PATCH] Fix Vagrant config. Refs #5870 --- .../files/etc/icinga2/conf.d/passive.conf | 30 +++++++++++-------- .../icinga2/features-available/ido-mysql.conf | 6 ++-- etc/icinga2/conf.d/users.conf | 10 +++---- 3 files changed, 25 insertions(+), 21 deletions(-) diff --git a/.vagrant-puppet/files/etc/icinga2/conf.d/passive.conf b/.vagrant-puppet/files/etc/icinga2/conf.d/passive.conf index b9c741c2f..455d666cf 100644 --- a/.vagrant-puppet/files/etc/icinga2/conf.d/passive.conf +++ b/.vagrant-puppet/files/etc/icinga2/conf.d/passive.conf @@ -4,17 +4,23 @@ * files in this directory are included. */ object Host "nsca-ng" { - import "generic-host", + import "generic-host" - display_name = "nsca-ng test", - - services["PassiveService1"] = { - templates = [ "generic-service" ], - check_command = "passive", - }, - - services["PassiveService2"] = { - templates = [ "generic-service" ], - check_command = "passive", - }, + display_name = "nsca-ng test" +} + +apply Service "PassiveService1" { + import "generic-service" + + check_command = "passive" + + assign where host.name == "nsca-ng" +} + +apply Service "PassiveService2" { + import "generic-service" + + check_command = "passive" + + assign where host.name == "nsca-ng" } diff --git a/.vagrant-puppet/files/etc/icinga2/features-available/ido-mysql.conf b/.vagrant-puppet/files/etc/icinga2/features-available/ido-mysql.conf index 70cec39a3..f1fe8ec89 100644 --- a/.vagrant-puppet/files/etc/icinga2/features-available/ido-mysql.conf +++ b/.vagrant-puppet/files/etc/icinga2/features-available/ido-mysql.conf @@ -6,8 +6,8 @@ library "db_ido_mysql" object IdoMysqlConnection "ido-mysql" { - user = "icinga", - password = "icinga", - host = "localhost", + user = "icinga" + password = "icinga" + host = "localhost" database = "icinga" } diff --git a/etc/icinga2/conf.d/users.conf b/etc/icinga2/conf.d/users.conf index dbe676f08..50183957d 100644 --- a/etc/icinga2/conf.d/users.conf +++ b/etc/icinga2/conf.d/users.conf @@ -10,14 +10,12 @@ object User "icingaadmin" { groups = [ "icingaadmins" ] macros = { - "name" = "Icinga 2 Admin" - "email" = "icinga@localhost" - "pager" = "icingaadmin@localhost.localdomain" + name = "Icinga 2 Admin" + email = "icinga@localhost" + pager = "icingaadmin@localhost.localdomain" } - custom = { - notes = "This is the Icinga 2 Admin account." - } + custom.notes = "This is the Icinga 2 Admin account." }