diff options
| -rw-r--r-- | network/nrpe/README | 12 | ||||
| -rw-r--r-- | network/nrpe/doinst.sh | 18 | ||||
| -rw-r--r-- | network/nrpe/nrpe.SlackBuild | 15 | ||||
| -rw-r--r-- | network/nrpe/nrpe.info | 10 | ||||
| -rw-r--r-- | network/nrpe/rc.nrpe | 2 | ||||
| -rw-r--r-- | network/nrpe/slack-desc | 2 |
6 files changed, 32 insertions, 27 deletions
diff --git a/network/nrpe/README b/network/nrpe/README index 06c1426952..2dba6da61d 100644 --- a/network/nrpe/README +++ b/network/nrpe/README @@ -1,8 +1,8 @@ nrpe (Nagios Remote Plugin Executor) -The NRPE addon is designed to allow you to execute Nagios plugins on -remote Linux/Unix machines. The main reason for doing this is to allow -Nagios to monitor "local" resources (like CPU load, memory usage, -etc.) remote machines. Since these public resources are not usually -exposed to external machines, an agent like NRPE must be installed on -the remote Linux/Unix machines. +The NRPE addon is designed to allow you to execute Nagios plugins on remote +Linux/Unix machines. The main reason for doing this is to allow Nagios +to monitor "local" resources (like CPU load, memory usage, etc.) remote +machines. Since these public resources are not usually exposed to external +machines, an agent like NRPE must be installed on the remote Linux/Unix +machines. diff --git a/network/nrpe/doinst.sh b/network/nrpe/doinst.sh index f9994024fe..c67a07e055 100644 --- a/network/nrpe/doinst.sh +++ b/network/nrpe/doinst.sh @@ -11,13 +11,17 @@ config() { # Otherwise, we leave the .new copy for the admin to consider... } -# Keep same perms on rc.nrpe.new: -if [ -e etc/rc.d/rc.nrpe ]; then - cp -a etc/rc.d/rc.nrpe etc/rc.d/rc.nrpe.new.incoming - cat etc/rc.d/rc.nrpe.new > etc/rc.d/rc.nrpe.new.incoming - mv etc/rc.d/rc.nrpe.new.incoming etc/rc.d/rc.nrpe.new -fi +preserve_perms() { + NEW="$1" + OLD="$(dirname $NEW)/$(basename $NEW .new)" + if [ -e $OLD ]; then + cp -a $OLD ${NEW}.incoming + cat $NEW > ${NEW}.incoming + mv ${NEW}.incoming $NEW + fi + config $NEW +} -config etc/rc.d/rc.nrpe.new +preserve_perms etc/rc.d/rc.nrpe.new config etc/nagios/nrpe.cfg.new diff --git a/network/nrpe/nrpe.SlackBuild b/network/nrpe/nrpe.SlackBuild index a1906a01a7..4c6b97b537 100644 --- a/network/nrpe/nrpe.SlackBuild +++ b/network/nrpe/nrpe.SlackBuild @@ -3,9 +3,10 @@ # Slackware build script for nrpe # Written by Zordrak <slackbuilds@tpa.me.uk> +# Modified by Mario Preksavec <mario@slackware.hr> PRGNAM=nrpe -VERSION=${VERSION:-2.12} +VERSION=${VERSION:-2.15} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -47,7 +48,7 @@ if ! grep ^nagios: /etc/group 2>&1 > /dev/null; then exit 1 elif ! grep ^nagios: /etc/passwd 2>&1 > /dev/null; then echo " You must have a \"nagios\" user to run this script." - echo " # useradd -u 213 -g nagios -d /usr/nagios -s /bin/false nagios" + echo " # useradd -u 213 -g nagios -d /dev/null -s /bin/false nagios" exit 1 fi @@ -59,10 +60,10 @@ tar xvf $CWD/$PRGNAM-$VERSION.tar.gz cd $PRGNAM-$VERSION chown -R root:root . find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; + \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ + -o -perm 511 \) -exec chmod 755 {} \; -o \ + \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ + -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ @@ -96,7 +97,7 @@ cat $CWD/rc.nrpe > $PKG/etc/rc.d/rc.nrpe.new mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a \ README README.SSL SECURITY LEGAL Changelog docs contrib sample-config \ - $PKG/usr/doc/$PRGNAM-$VERSION + $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/network/nrpe/nrpe.info b/network/nrpe/nrpe.info index 32361765b8..a1d22ec46a 100644 --- a/network/nrpe/nrpe.info +++ b/network/nrpe/nrpe.info @@ -1,10 +1,10 @@ PRGNAM="nrpe" -VERSION="2.12" +VERSION="2.15" HOMEPAGE="http://www.nagios.org" -DOWNLOAD="http://downloads.sourceforge.net/nagios/nrpe-2.12.tar.gz" -MD5SUM="b2d75e2962f1e3151ef58794d60c9e97" +DOWNLOAD="http://downloads.sourceforge.net/nagios/nrpe-2.15.tar.gz" +MD5SUM="3921ddc598312983f604541784b35a50" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" -MAINTAINER="Zordrak" -EMAIL="slackbuilds@tpa.me.uk" +MAINTAINER="Mario Preksavec" +EMAIL="mario at slackware dot hr" diff --git a/network/nrpe/rc.nrpe b/network/nrpe/rc.nrpe index 4cfa94bdad..1c46b94255 100644 --- a/network/nrpe/rc.nrpe +++ b/network/nrpe/rc.nrpe @@ -1,7 +1,7 @@ #!/bin/sh # # nrpe daemon control script. -# +# # This is an init script for the nrpe daemon. # To use nrpe, you must first set up the config file(s). # diff --git a/network/nrpe/slack-desc b/network/nrpe/slack-desc index 5ca48d52af..a4a92979c7 100644 --- a/network/nrpe/slack-desc +++ b/network/nrpe/slack-desc @@ -15,5 +15,5 @@ nrpe: etc.) remote machines. Since these public resources are not usually nrpe: exposed to external machines, an agent like NRPE must be installed on nrpe: the remote Linux/Unix machines. nrpe: -nrpe: http://www.nagios.org/ +nrpe: Homepage: http://www.nagios.org/ nrpe: |