Fix Vagrant config.

Refs #5870

diff --git a/.vagrant-puppet/files/etc/icinga2/conf.d/passive.conf b/.vagrant-puppet/files/etc/icinga2/conf.d/passive.conf
index b9c741c2f74f1070a363d5c594d9f2aa5b31ef5b..455d666cf4156c24736d49e0e1433de8efab993f 100644 (file)
--- 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",
+  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"
 
-  services["PassiveService1"] = {
-    templates = [ "generic-service" ],
-    check_command = "passive",
-  },
+  check_command = "passive"
 
-  services["PassiveService2"] = {
-    templates = [ "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 70cec39a3539404e33af6a8ab551378c792452cc..f1fe8ec89b451a6590ae04e62bdbbcb4cf0156da 100644 (file)
--- 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 dbe676f08ce6338b17cd701c61336b6b8859f8ed..50183957d3cb720d3934e5d28b1d8315797baf1a 100644 (file)
--- 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."
 }