From: Ethan G. <ega...@us...> - 2002-02-22 01:15:39
|
Update of /cvsroot/nagios/nrpe In directory usw-pr-cvs1:/tmp/cvs-serv30470 Modified Files: Changelog Makefile.in README configure configure.in nrpe.cfg Added Files: init-script Log Message: Name and version change --- NEW FILE --- #!/bin/sh # # Created 2000-01-03 by ja...@gr... # # nrpe This shell script takes care of starting and stopping # nrpe. # # chkconfig: 2345 80 30 # description: nrpe is a daemon for a remote nagios server, \ # running nagios plugins on this host. # processname: nrpe # config: /usr/local/nagios/etc/nrpe.cfg # Source function library if [ -f /etc/rc.d/init.d/functions ]; then . /etc/rc.d/init.d/functions elif [ -f /etc/init.d/functions ]; then . /etc/init.d/functions elif [ -f /etc/rc.d/functions ]; then . /etc/rc.d/functions fi # Source networking configuration. . /etc/sysconfig/network # Check that networking is up. [ ${NETWORKING} = "no" ] && exit 0 prefix=/usr/local/nagios exec_prefix=${prefix} NrpeBin=${exec_prefix}/bin/nrpe NrpeCfg=${prefix}/etc/nrpe.cfg # See how we were called. case "$1" in start) # Start daemons. echo -n "Starting nrpe: " daemon $NrpeBin -d $NrpeCfg echo touch /var/lock/subsys/nrpe ;; stop) # Stop daemons. echo -n "Shutting down nrpe: " killproc nrpe echo rm -f /var/lock/subsys/nrpe ;; restart) $0 stop $0 start ;; status) status nrpe ;; *) echo "Usage: nrpe {start|stop|restart|status}" exit 1 esac exit 0 Index: Changelog =================================================================== RCS file: /cvsroot/nagios/nrpe/Changelog,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -r1.1.1.1 -r1.2 *** Changelog 23 Jun 2001 17:02:57 -0000 1.1.1.1 --- Changelog 22 Feb 2002 01:15:34 -0000 1.2 *************** *** 3,10 **** ************** ! 1.3 - 06/23/2001 ---------------- ! - Name change ! - Version number change --- 3,23 ---- ************** ! ! 1.3 - 02/21/2002 ---------------- ! - Name and version change ! - Ignore SIGHUP, minor cleanup (Jon Andrews) ! ! ! 1.2.5 - 12/22/2001 ! ------------------ ! - Implemented Beej's sendall() to handle partial send()s ! - Added instructions on running under xinetd to README ! - Removed some old crud ! ! ! 1.2.4 - 02/22/2001 ! ------------------ ! - I forgot what changes I made. Go figure... *************** *** 86,90 **** ------------------ - Added configure script ! - Netutils functions from the plugins is now used - Reset SIGCHLD to default behavior before calling popen() to prevent race condition with pclose() (Reported by Rene Klootwijk) --- 99,103 ---- ------------------ - Added configure script ! - Netutils functions from the NetSaint plugins is now used - Reset SIGCHLD to default behavior before calling popen() to prevent race condition with pclose() (Reported by Rene Klootwijk) Index: Makefile.in =================================================================== RCS file: /cvsroot/nagios/nrpe/Makefile.in,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -r1.1.1.1 -r1.2 *** Makefile.in 23 Jun 2001 17:02:57 -0000 1.1.1.1 --- Makefile.in 22 Feb 2002 01:15:34 -0000 1.2 *************** *** 2,6 **** # Makefile for NRPE # ! # Last Modified: 01/21/2000 ############################### --- 2,6 ---- # Makefile for NRPE # ! # Last Modified: 12-23-2001 ############################### *************** *** 10,14 **** SRC_COMMON=./common/ ! all: nrpe check_nrpe nrpe: --- 10,15 ---- SRC_COMMON=./common/ ! all: ! cd $(SRC_BASE); $(MAKE) ; cd .. nrpe: *************** *** 22,32 **** cd $(SRC_BASE); $(MAKE) $@ ; cd .. rm -f core distclean: clean - cd $(SRC_BASE); $(MAKE) $@ ; cd .. - rm -f config.log config.status config.cache Makefile \ - $(SRC_COMMON)/config.h \ ! devclean: distclean ! rm -f *~ */*~ --- 23,31 ---- cd $(SRC_BASE); $(MAKE) $@ ; cd .. rm -f core + rm -f *~ */*~ + rm -f config.log config.status config.cache Makefile $(SRC_COMMON)/config.h distclean: clean ! devclean: clean Index: README =================================================================== RCS file: /cvsroot/nagios/nrpe/README,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -r1.1.1.1 -r1.2 *** README 23 Jun 2001 17:02:57 -0000 1.1.1.1 --- README 22 Feb 2002 01:15:34 -0000 1.2 *************** *** 6,10 **** Purpose ------- ! The purpose of this addon is to allow you to execute Nagios plugins on a remote host in as transparent a manner as possible. --- 6,10 ---- Purpose ------- ! The purpose of this addon is to allow you to execute Nagios plugins on a remote host in as transparent a manner as possible. *************** *** 71,79 **** ! Running Under INETD ! ------------------- ! If you plan on running nrpe under inetd and making use of TCP ! wrappers, you need to do two things: 1) Add a line to your /etc/services file as follows (modify the port --- 71,79 ---- ! Running Under INETD or XINETD ! ----------------------------- ! If you plan on running nrpe under inetd or xinetd and making use ! of TCP wrappers, you need to do the following things: 1) Add a line to your /etc/services file as follows (modify the port *************** *** 82,91 **** nrpe 5666/tcp # NRPE ! 2) Add an entry to /etc/inetd.conf as follows nrpe stream tcp nowait <user> /usr/sbin/tcpd <nrpebin> -i <nrpecfg> ! - Replace <user> with the name of the user that nrpe should run as ! Example: nagios - Replace <nrpebin> with the path to the nrpe binary on your system. Example: /usr/local/nagios/nrpe --- 82,94 ---- nrpe 5666/tcp # NRPE ! 2) If your system uses the inetd superserver, add an entry to ! /etc/inetd.conf as follows: ! nrpe stream tcp nowait <user> /usr/sbin/tcpd <nrpebin> -i <nrpecfg> ! ! - Replace <user> with the name of the user that the nrpe server should run as. ! Example: nagios - Replace <nrpebin> with the path to the nrpe binary on your system. Example: /usr/local/nagios/nrpe *************** *** 93,107 **** Example: /usr/local/nagios/nrpe.cfg ! 3) Restart inetd will the following command /etc/rc.d/init.d/inet restart ! 4) Add entries to your /etc/hosts.allow and /etc/hosts.deny file to enable TCP wrapper protection for the nrpe service. This is optional, although highly recommended. ! Note: If you run nrpe under inetd, the server_port and ! allowed_hosts variables in the nrpe.cfg configuration file are ignored. --- 96,141 ---- Example: /usr/local/nagios/nrpe.cfg ! 3) If your system uses xinetd instead of inetd, you'll probably ! want to create a file called 'nrpe' in your /etc/xinetd.d ! directory that contains the following entries: ! ! ! # default: on ! # description: NRPE ! service nrpe ! { ! flags = REUSE ! socket_type = stream ! wait = no ! user = <user> ! server = <nrpebin> ! server_args = -i <nrpecfg> ! log_on_failure += USERID ! disable = no ! only_from = <ipaddress1> <ipaddress2> ... ! } ! ! ! - Replace <user> with the name of the user that the nrpe server should run as. ! - Replace <nrpebin> with the path to the nrpe binary on your system. ! - Replace <nrpecfg> with the path to the nrpe config file on your system. ! - Replace the <ipaddress> fields with the IP addresses of hosts which ! are allowed to connect to the NRPE daemon. This only works if xinetd was ! compiled with support for wrappers. ! ! 4) Restart inetd or xinetd will the following command (pick the ! on that is appropriate for your system: /etc/rc.d/init.d/inet restart ! /etc/rc.d/init.d/xinetd restart ! ! 5) Add entries to your /etc/hosts.allow and /etc/hosts.deny file to enable TCP wrapper protection for the nrpe service. This is optional, although highly recommended. ! Note: If you run nrpe under inetd or xinetd, the server_port ! and allowed_hosts variables in the nrpe configuration file are ignored. Index: configure =================================================================== RCS file: /cvsroot/nagios/nrpe/configure,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -r1.1.1.1 -r1.2 *** configure 23 Jun 2001 17:02:57 -0000 1.1.1.1 --- configure 22 Feb 2002 01:15:34 -0000 1.2 *************** *** 2,6 **** # Guess values for system-dependent variables and create Makefiles. ! # Generated automatically using autoconf version 2.12 # Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc. # --- 2,6 ---- # Guess values for system-dependent variables and create Makefiles. ! # Generated automatically using autoconf version 2.13 # Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc. [...1139 lines suppressed...] s%@LDFLAGS@%$LDFLAGS%g *************** *** 1736,1739 **** --- 1816,1820 ---- s%@mandir@%$mandir%g s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g + s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g s%@INSTALL_DATA@%$INSTALL_DATA%g s%@INSTALL@%$INSTALL%g *************** *** 1962,1965 **** --- 2043,2050 ---- + echo "" + echo "" + echo "Type 'make all' to compile the NRPE daemon and client." + echo "" Index: configure.in =================================================================== RCS file: /cvsroot/nagios/nrpe/configure.in,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -r1.1.1.1 -r1.2 *** configure.in 23 Jun 2001 17:02:57 -0000 1.1.1.1 --- configure.in 22 Feb 2002 01:15:34 -0000 1.2 *************** *** 2,6 **** AC_INIT(src/nrpe.c) AC_CONFIG_HEADER(common/config.h) ! AC_PREFIX_DEFAULT(/usr/local/nnagios) dnl Figure out how to invoke "install" and what install options to use. --- 2,6 ---- AC_INIT(src/nrpe.c) AC_CONFIG_HEADER(common/config.h) ! AC_PREFIX_DEFAULT(/usr/local/nagios) dnl Figure out how to invoke "install" and what install options to use. *************** *** 45,48 **** --- 45,52 ---- AC_OUTPUT(Makefile src/Makefile) + echo "" + echo "" + echo "Type 'make all' to compile the NRPE daemon and client." + echo "" Index: nrpe.cfg =================================================================== RCS file: /cvsroot/nagios/nrpe/nrpe.cfg,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -r1.1.1.1 -r1.2 *** nrpe.cfg 23 Jun 2001 17:02:57 -0000 1.1.1.1 --- nrpe.cfg 22 Feb 2002 01:15:34 -0000 1.2 *************** *** 3,7 **** # Written by: Ethan Galstad (na...@na...) # ! # Last Modified: 06/23/2001 #################################################### --- 3,7 ---- # Written by: Ethan Galstad (na...@na...) # ! # Last Modified: 02-21-2002 #################################################### |