Version bump. Added metadata. Removed old config and init script

3 files changed, 22 insertions, 10 deletions

diff --git a/net-analyzer/nagios-nrpe/files/digest-nagios-nrpe-2.0 b/net-analyzer/nagios-nrpe/files/digest-nagios-nrpe-2.0
new file mode 100644
index 000000000000..fb06ce736c2b
--- /dev/null
+++ b/net-analyzer/nagios-nrpe/files/digest-nagios-nrpe-2.0
@@ -0,0 +1 @@
+MD5 70ef9502a3b7e49fa520dbceabfa04d0 nrpe-2.0.tar.gz 52157
diff --git a/net-analyzer/nagios-nrpe/files/nrpe b/net-analyzer/nagios-nrpe/files/nrpe-2.0
index 3989bca7a26f..dfb4f832138e 100644
--- a/net-analyzer/nagios-nrpe/files/nrpe
+++ b/net-analyzer/nagios-nrpe/files/nrpe-2.0
@@ -9,7 +9,8 @@ start() {
 	start-stop-daemon --start --quiet --name nrpe \
 	--startas /usr/nagios/bin/nrpe \
 		-c nagios:nagios \
-		-- -d /etc/nagios/nrpe.cfg
+		-- -c /etc/nagios/nrpe.cfg \
+		--daemon
 	eend $? "Failed to Start nrpe"
 }
 
diff --git a/net-analyzer/nagios-nrpe/files/nrpe.cfg b/net-analyzer/nagios-nrpe/files/nrpe-2.0.cfg
index 3132ea336507..3f35b7e46964 100644
--- a/net-analyzer/nagios-nrpe/files/nrpe.cfg
+++ b/net-analyzer/nagios-nrpe/files/nrpe-2.0.cfg
@@ -2,7 +2,7 @@
 # Sample NRPE Config File 
 # Written by: Ethan Galstad (nagios@nagios.org)
 # 
-# Last Modified: 06-03-2002
+# Last Modified: 12-30-2002
 #
 # NOTES:
 # This is a sample configuration file for the NRPE daemon.  It needs to be
@@ -74,6 +74,14 @@ debug=0
 
 
 
+# COMMAND TIMEOUT
+# This specifies the maximum number of seconds that the NRPE daemon will
+# allow plugins to finish executing before killing them off.
+
+command_timeout=60
+
+
+
 # COMMAND DEFINITIONS
 # Command definitions that this daemon will run.  Definitions
 # are in the following format:
@@ -89,11 +97,13 @@ debug=0
 # Note: Any plugins that are used in the command lines must reside
 # on the machine that this daemon is running on!  The examples below
 # assume that you have plugins installed in a /usr/nagios/libexec
-# directory.
-
-command[check_users]=/usr/nagios/libexec/check_users 5 10
-command[check_load]=/usr/nagios/libexec/check_load 5 10 15 20 25 30
-command[check_disk1]=/usr/nagios/libexec/check_disk 80 95 /dev/hda1
-command[check_disk2]=/usr/nagios/libexec/check_disk 80 95 /dev/hdb1
-command[check_zombie_procs]=/usr/nagios/libexec/check_procs 5 10 Z
-command[check_total_procs]=/usr/nagios/libexec/check_procs 150 200 
+# directory.  Also note that you will have to modify the definitions below
+# to match the argument format the plugins expect.  Remember, these are
+# examples only!
+
+command[check_users]=/usr/nagios/libexec/check_users -w 5 -c 10
+command[check_load]=/usr/nagios/libexec/check_load -w 15,10,5 -c 30,25,20
+command[check_disk1]=/usr/nagios/libexec/check_disk -w 20 -c 10 -p /dev/hda1
+command[check_disk2]=/usr/nagios/libexec/check_disk -w 20 -c 10 -p /dev/hdb1
+command[check_zombie_procs]=/usr/nagios/libexec/check_procs -w 5 -c 10 -s Z
+command[check_total_procs]=/usr/nagios/libexec/check_procs -w 150 -c 200