[Pkg-nagios-changes] [SCM] debian packaging of PNP4Nagios branch, master, updated. 68fd41f078469cd3d16c769d67df11881bbab6ae

[Sebastian Harl]

The following commit has been merged in the master branch:
commit 531f3deb3b014e1818de2f66fd5fad2f15488af9
Author: Sebastian Harl <sh at tokkee.org>
Date:   Mon Feb 14 13:11:23 2011 +0100

    pnp4nagios-bin.npcd.default: Disable NPCD by default.
    
    Using NPCD is optional, so it should not be enabled by default. Also, users
    might want to modify the configuration before having the daemon started.
    
    Updated README.Debian to reflect this change.

diff --git a/debian/README.Debian b/debian/README.Debian
index 81bf328..a275abd 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -1,21 +1,24 @@
-pnp4nagios for Debian
+PNP4Nagios for Debian
 ---------------------
 
-The Debian package of PNP4Nagios uses NPCD for an easy installation *and* fast
-processing of performance data.
+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.
 
-Please change the "process_performance_data" statement in
-"/etc/nagios3/nagios.cfg" to "process_performance_data=1".
+In order to enable processing of performance data in Nagios, please change the
+"process_performance_data" statement in "/etc/nagios3/nagios.cfg" to
+"process_performance_data=1".
 
-Add the following line (without quotes) to "/etc/nagios3/nagios.cfg":
+To register the NPC event broker module (npcdmod), add the following line
+(without quotes) to "/etc/nagios3/nagios.cfg":
 
 "broker_module=/usr/lib/pnp4nagios/npcdmod.o config_file=/etc/pnp4nagios/npcd.cfg"
 
-Finally reload your Nagios server by "/etc/init.d/nagios3 reload". All
-performance date should be processed.
+Finally reload your Nagios server by running "/etc/init.d/nagios3 reload". All
+performance data should be processed now.
 
-If you want links to PNP4Nagios for your monitored hosts and services in Nagios
-web frontend just add
+If you want links to PNP4Nagios for your monitored hosts and services in the
+Nagios web frontend just add
 
 - "action_url  /pnp4nagios/graph?host=$HOSTNAME$"
   to your hosts or host template(s)
@@ -23,4 +26,7 @@ web frontend just add
 - "action_url  /pnp4nagios/graph?host=$HOSTNAME$&srv=$SERVICEDESC$"
   to your services or service template(s)
 
+For more information and different modes of operation, see
+<http://docs.pnp4nagios.org/pnp-0.6/config>.
+
  -- Sven Velt <sven at velt.de>  Wed, 30 Sep 2009 13:55:35 +0000
diff --git a/debian/pnp4nagios-bin.npcd.default b/debian/pnp4nagios-bin.npcd.default
index dba2ddf..f474034 100644
--- a/debian/pnp4nagios-bin.npcd.default
+++ b/debian/pnp4nagios-bin.npcd.default
@@ -1,7 +1,7 @@
 # Default settings for the NPCD init script.
 
 # Should NPCD be started? ("yes" to enable)
-RUN="yes"
+RUN="no"
 
 # Additional options that are passed to the daemon.
 DAEMON_OPTS="-d -f /etc/pnp4nagios/npcd.cfg"

-- 
debian packaging of PNP4Nagios