[icinga-checkins] icinga.org: icinga2/master: Removed the '#' prefix for the config statements 'include' and 'library'.

git at icinga.org git at icinga.org
Thu Mar 21 15:25:20 CET 2013


Module: icinga2
Branch: master
Commit: a03d609f7c22adbe65dd2b70582dc8de6d7d7a35
URL:    https://git.icinga.org/?p=icinga2.git;a=commit;h=a03d609f7c22adbe65dd2b70582dc8de6d7d7a35

Author: Gunnar Beutner <gunnar.beutner at netways.de>
Date:   Thu Mar 21 14:30:28 2013 +0100

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

---

 etc/icinga2/icinga2.conf.dist  |    6 +++---
 etc/icinga2/icinga2.conf.win32 |    4 ++--
 itl/itl.conf                   |    8 ++++----
 itl/standalone.conf            |    6 +++---
 lib/config/config_lexer.ll     |    4 ++--
 5 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/etc/icinga2/icinga2.conf.dist b/etc/icinga2/icinga2.conf.dist
index 02a4759..1a9986e 100644
--- 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 89a32de..ac9f037 100644
--- 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 0ba84e4..b7915bc 100644
--- 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 2ba784c..0da22a8 100644
--- 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 6a785e0..3ea4633 100644
--- 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;





More information about the icinga-checkins mailing list