Update README.Debian

diff --git a/debian/README.Debian b/debian/README.Debian
index 5311c2f50b60b39d501d342f4c84c88265c38928..df28ebb8934d3da94d44ffa2dc75f305ebaa6c9e 100644 (file)
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -5,8 +5,8 @@ PNP4Nagios supports several modes of operation. They differ in the way how
 performance data is being processed and, thus, the efficiency of PNP. Detailed
 documentation is available at <http://docs.pnp4nagios.org/pnp-0.6/modes>.
 
 performance data is being processed and, thus, the efficiency of PNP. Detailed
 documentation is available at <http://docs.pnp4nagios.org/pnp-0.6/modes>.
 

-Using bulk mode
----------------
+Using bulk mode for Nagios3
+---------------------------

 
 We recommend to use bulk mode with NPCD and npcdmod. This will facilitate an
 easy installation and fast processing of performance data. To enable NPCD, set
 
 We recommend to use bulk mode with NPCD and npcdmod. This will facilitate an
 easy installation and fast processing of performance data. To enable NPCD, set


@@ -21,9 +21,31 @@ To register the NPC event broker module (npcdmod), add the following line
 
 "broker_module=/usr/lib/pnp4nagios/npcdmod.o config_file=/etc/pnp4nagios/npcd.cfg"
 
 
 "broker_module=/usr/lib/pnp4nagios/npcdmod.o config_file=/etc/pnp4nagios/npcd.cfg"
 

-Finally reload your Nagios server by running "/etc/init.d/nagios3 reload". All
+Finally reload your Nagios server by running "service reload". All

 performance data should be processed now.
 
 performance data should be processed now.
 

+Using bulk mode for Icinga
+---------------------------
+
+We recommend to use bulk mode with NPCD and npcdmod. This will facilitate an
+easy installation and fast processing of performance data. To enable NPCD, set
+'RUN' to 'yes' in /etc/default/npcd.
+
+In order to enable processing of performance data in Nagios, please change the
+"process_performance_data" statement in "/etc/icinga/icinga.cfg" to
+"process_performance_data=1".
+
+To register the NPC event broker module (npcdmod), copy the file
+"/usr/share/doc/pnp4nagios-web-config-icinga/examples/npcdmod.cfg" to
+"/etc/icinga/modules"
+
+Finally reload your Icinga server by running "service icinga reload". All
+performance data should be processed now.
+
+
+Add links for PNP4Nagios to Nagios/Icinga Webfrontend
+-----------------------------------------------------
+

 If you want links to PNP4Nagios for your monitored hosts and services in the
 Nagios web frontend just add
 
 If you want links to PNP4Nagios for your monitored hosts and services in the
 Nagios web frontend just add
 


@@ -50,8 +72,8 @@ instructions.
 In addition, the following configuration is required to get you started:
 
 - Enable processing of performance data in Nagios: set
 In addition, the following configuration is required to get you started:
 
 - Enable processing of performance data in Nagios: set

-  'process_performance_data=1' in "/etc/nagios3/nagios.cfg" and reload your
-  Nagios server: /etc/init.d/nagios3 reload.
+  'process_performance_data=1' in "/etc/nagios3/nagios.cfg" or "/etc/icinga/icingacfg" 
+  and reload your monitoring system: "service icinga/nagios reload".

 
 - Enable the PNP Gearman worker daemon by setting 'RUN' to 'yes' in
   /etc/default/pnp_gearman_worker. Check the Gearman related options in
 
 - Enable the PNP Gearman worker daemon by setting 'RUN' to 'yes' in
   /etc/default/pnp_gearman_worker. Check the Gearman related options in


@@ -67,13 +89,3 @@ available in the libgearman-client-perl, perl, and libcrypt-rijndael-perl
 Debian packages (see packages suggested by pnp4nagios-bin).
 
  -- Sebastian Harl <tokkee@debian.org>  Wed, 27 Apr 2011 09:32:52 +0200
 Debian packages (see packages suggested by pnp4nagios-bin).
 
  -- Sebastian Harl <tokkee@debian.org>  Wed, 27 Apr 2011 09:32:52 +0200

-
-Installation with Icinga
-------------------------
-
-If you use Icinga you also have to change /etc/pnp4nagios/apache.conf and
-replace the line "AuthUserFile /etc/nagios3/htpasswd.users" with
-"AuthUserFile /etc/icinga/htpasswd.users".
-
- -- Alexander Reichle-Schmehl <tolimar@debian.org>  Tue, 25 Oct 2011 14:31:28 +0200
-