Merge branch 'master' into feature/localization-form-6073

Conflicts:
	application/forms/Config/GeneralForm.php
	application/forms/Preference/GeneralForm.php
	library/Icinga/Application/Web.php

.gitattributes

@@ -0,0 +1 @@
+.git* export-ignore

.gitignore

@@ -10,7 +10,8 @@
 !.gitkeep
 
 build/
-test/js/npm-debug.log
+
+development/
 
 # ./configure output
 config.log
@@ -20,10 +21,9 @@ config.status
 Makefile
 
 # cmd tester
-test/php/bin/extcmd_test
+modules/test/bin/extcmd_test
 
 # misc test output
-test/frontend/static/public
 test/php/library/Icinga/Protocol/Statusdat/.cache
 
 # Generated API documentation
@@ -38,6 +38,9 @@ config/preferences/*.ini
 # Application logfiles
 var/log/*.log
 
+# Packaging
 /debian
+*.tar.gz
+*.komodoproject
 
 

.vagrant-puppet/files/etc/icinga2/conf.d/test-config.conf

@@ -1,6 +1,6 @@
 object CheckCommand "dummy-host" {
     import "plugin-check-command"
-    command = [ PluginDir + "/libexec/test_hostcheck.pl" ]
+    command = [ PluginDir + "/test_hostcheck.pl" ]
     arguments = {
             "--type"            = "$check_type$"
             "--failchance"      = "$check_failchance$"
@@ -18,7 +18,7 @@ object CheckCommand "dummy-host" {
 
 object CheckCommand "dummy-service" {
     import "plugin-check-command"
-    command = [ PluginDir + "/libexec/test_servicecheck.pl" ]
+    command = [ PluginDir + "/test_servicecheck.pl" ]
     arguments = {
             "--total-critical-on-host"  = "$check_critical_on_host$"
             "--total-warning-on-host"   = "$check_warning_on_host$"
@@ -76,7 +76,7 @@ __function createService(service_type, num) {
         enable_active_checks = (service_type != "pending")
         vars.check_type = service_type
 
-        assign where match("*" + service_type + "*", host.vars.check_config)
+        assign where service_type in host.vars.check_config
     }
 }
 
@@ -102,12 +102,12 @@ __function createHost(checkType, checkConfig, num, checkEnabled) {
 }
 
 __for (num in range(10)) {
-     createHost("ok", "ok", num, true)
-     createHost("random", "random,flapping", num, true)
-     createHost("down", "warning,critical", num, true)
-     createHost("unreachable", "unknown", num, true)
-     createHost("pending", "pending", num, false)
-     createHost("flap", "flapping", num, true)
+     createHost("ok", [ "ok" ], num, true)
+     createHost("random", [ "random", "flapping" ], num, true)
+     createHost("down", [ "warning", "critical" ], num, true)
+     createHost("unreachable", [ "unknown" ], num, true)
+     createHost("pending", [ "pending" ], num, false)
+     createHost("flap", [ "flapping" ], num, true)
 }
 
 // EOF

.vagrant-puppet/files/var/www/html/icingaweb/index.php

@@ -1,3 +1,5 @@
 <?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 include '/vagrant/library/Icinga/Application/webrouter.php';