Removed the '#' prefix for the config statements 'include' and 'library'.

diff --git a/etc/icinga2/icinga2.conf.dist b/etc/icinga2/icinga2.conf.dist
index 02a47591434f89d0efb4a13180773e80a021afc2..1a9986e464398e8c63bd77d25b77631e07d1f2d7 100644 (file)
--- a/etc/icinga2/icinga2.conf.dist
+++ b/etc/icinga2/icinga2.conf.dist
@@ -7,8 +7,8 @@
  * description of what configuration options are available.
  */
 
-#include <itl/itl.conf>
-#include <itl/standalone.conf>
+include <itl/itl.conf>
+include <itl/standalone.conf>
 
 /**
  * Global configuration settings
@@ -24,7 +24,7 @@ local object IcingaApplication "icinga" {
  * files. These are used by the Icinga 1.x CGIs to display the state of
  * hosts and services.
  */
-#library "compat"
+library "compat"
 local object CompatComponent "compat" { }
 
 /**

diff --git a/etc/icinga2/icinga2.conf.win32 b/etc/icinga2/icinga2.conf.win32
index 89a32de8a8c0ac51007dd33ef575533b470b0393..ac9f037b77107217e92e503427fbe8676e515dc9 100644 (file)
--- a/etc/icinga2/icinga2.conf.win32
+++ b/etc/icinga2/icinga2.conf.win32
@@ -18,7 +18,7 @@ local object IcingaApplication "icinga" {
   state_path = "icinga2.state",
 
   macros = {
-    plugindir = "C:\Plugins"
+    plugindir = "C:\\Plugins"
   }
 }
 
@@ -27,7 +27,7 @@ local object IcingaApplication "icinga" {
  * files. These are used by the Icinga 1.x CGIs to display the state of
  * hosts and services.
  */
-#library "compat"
+library "compat"
 local object Component "compat" {
   status_path = "status.dat",
   objects_path = "objects.cache",

diff --git a/itl/itl.conf b/itl/itl.conf
index 0ba84e41eb51ca4355cad2f7d629bf23be5e6202..b7915bcb7ee5ffe89bc45477374597a809bd1315 100644 (file)
--- a/itl/itl.conf
+++ b/itl/itl.conf
@@ -22,7 +22,7 @@
  * configuration templates.
  */
 
-#include "host.conf"
-#include "service.conf"
-#include "service-common.conf"
-#include "notification.conf"
+include "host.conf"
+include "service.conf"
+include "service-common.conf"
+include "notification.conf"

diff --git a/itl/standalone.conf b/itl/standalone.conf
index 2ba784c7875f6343af25d8872a17c7f08415e9f2..0da22a8c0558817ad283e668835302f7294b6c39 100644 (file)
--- a/itl/standalone.conf
+++ b/itl/standalone.conf
@@ -17,11 +17,11 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#library "checker"
+library "checker"
 local object CheckerComponent "checker" {}
 
-#library "delegation"
+library "delegation"
 local object DelegationComponent "delegation" {}
 
-#library "notification"
+library "notification"
 local object NotificationComponent "notification" {}

diff --git a/lib/config/config_lexer.ll b/lib/config/config_lexer.ll
index 6a785e026ef24d0a348b6537815ed6f7179be8e1..3ea4633a8b7397e459b1bdbde20973986add2219 100644 (file)
--- a/lib/config/config_lexer.ll
+++ b/lib/config/config_lexer.ll
@@ -195,8 +195,8 @@ abstract                    return T_ABSTRACT;
 local                          return T_LOCAL;
 object                         return T_OBJECT;
 template                       return T_TEMPLATE;
-#include                       return T_INCLUDE;
-#library                       return T_LIBRARY;
+include                                return T_INCLUDE;
+library                                return T_LIBRARY;
 inherits                       return T_INHERITS;
 null                           return T_NULL;
 partial                                return T_PARTIAL;