From d65ba6a40f58a4f57d161862c2b6a37668ea7af9 Mon Sep 17 00:00:00 2001
From: Gunnar Beutner <gunnar.beutner@netways.de>
Date: Mon, 30 Sep 2013 09:53:38 +0200
Subject: [PATCH] Add more feature config files.

---
 doc/2.1.2-setting-up-icinga-classic-ui.md      |  1 -
 etc/icinga2/features-available/command.conf    |  9 +++++++++
 etc/icinga2/features-available/compat-log.conf |  9 +++++++++
 etc/icinga2/features-available/compat.conf     | 12 ------------
 etc/icinga2/features-available/livestatus.conf |  8 ++++++++
 etc/icinga2/features-available/statusdat.conf  | 10 ++++++++++
 6 files changed, 36 insertions(+), 13 deletions(-)
 create mode 100644 etc/icinga2/features-available/command.conf
 create mode 100644 etc/icinga2/features-available/compat-log.conf
 delete mode 100644 etc/icinga2/features-available/compat.conf
 create mode 100644 etc/icinga2/features-available/livestatus.conf
 create mode 100644 etc/icinga2/features-available/statusdat.conf

diff --git a/doc/2.1.2-setting-up-icinga-classic-ui.md b/doc/2.1.2-setting-up-icinga-classic-ui.md
index 7a255afcf..7f1920bfc 100644
--- a/doc/2.1.2-setting-up-icinga-classic-ui.md
+++ b/doc/2.1.2-setting-up-icinga-classic-ui.md
@@ -60,7 +60,6 @@ In order for commands to work you will need to grant the web server
 write permissions for the command pipe:
 
     # chgrp www-data /var/run/icinga2/cmd/icinga2.cmd
-    # chmod 660 /var/run/icinga2/cmd/icinga2.cmd
 
 > **Note**
 >
diff --git a/etc/icinga2/features-available/command.conf b/etc/icinga2/features-available/command.conf
new file mode 100644
index 000000000..35830560e
--- /dev/null
+++ b/etc/icinga2/features-available/command.conf
@@ -0,0 +1,9 @@
+/**
+ * The ExternalCommandListener implements support for the external
+ * commands pipe.
+ */
+
+library "compat"
+
+object ExternalCommandListener "command" { }
+
diff --git a/etc/icinga2/features-available/compat-log.conf b/etc/icinga2/features-available/compat-log.conf
new file mode 100644
index 000000000..b322feb7b
--- /dev/null
+++ b/etc/icinga2/features-available/compat-log.conf
@@ -0,0 +1,9 @@
+/**
+ * The CompatLogger type is responsible for writing log files in a format
+ * that is compatible with Icinga 1.x.
+ */
+
+library "compat"
+
+object CompatLogger "compat-log" { }
+
diff --git a/etc/icinga2/features-available/compat.conf b/etc/icinga2/features-available/compat.conf
deleted file mode 100644
index c7ed7cbcc..000000000
--- a/etc/icinga2/features-available/compat.conf
+++ /dev/null
@@ -1,12 +0,0 @@
-/**
- * The compat library periodically updates the status.dat and objects.cache
- * files. These are used by the Icinga 1.x CGIs to display the state of
- * hosts and services. CompatLog writeis the Icinga 1.x icinga.log and archives.
- */
-
-library "compat"
-
-object StatusDataWriter "status" { }
-object ExternalCommandListener "command" { }
-object CompatLogger "compat-log" { }
-
diff --git a/etc/icinga2/features-available/livestatus.conf b/etc/icinga2/features-available/livestatus.conf
new file mode 100644
index 000000000..45d44d6b9
--- /dev/null
+++ b/etc/icinga2/features-available/livestatus.conf
@@ -0,0 +1,8 @@
+/**
+ *  The livestatus library implements the livestatus query protocol.
+ */
+
+library "livestatus"
+
+object LivestatusListener "livestatus" { }
+
diff --git a/etc/icinga2/features-available/statusdat.conf b/etc/icinga2/features-available/statusdat.conf
new file mode 100644
index 000000000..af02aa521
--- /dev/null
+++ b/etc/icinga2/features-available/statusdat.conf
@@ -0,0 +1,10 @@
+/**
+ * The StatusDataWriter type periodically updates the status.dat and objects.cache
+ * files. These are used by the Icinga 1.x CGIs to display the state of
+ * hosts and services.
+ */
+
+library "compat"
+
+object StatusDataWriter "status" { }
+
-- 
2.50.1