From c64a521ce73c25f03ce18c3eb944fae5ca94b2da Mon Sep 17 00:00:00 2001 From: Mario Preksavec Date: Wed, 25 Feb 2015 13:30:17 +0100 Subject: [PATCH] network/nagios: Use monitoring-plugins by default. --- network/nagios/README | 2 +- network/nagios/nagios.SlackBuild | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/network/nagios/README b/network/nagios/README index 575396efbc..9989321599 100644 --- a/network/nagios/README +++ b/network/nagios/README @@ -19,7 +19,7 @@ This SlackBuild installs the basic nagios system in /var/www/htdocs/ To change the location, set the DOCROOT variable: # DOCROOT=/your/docroot/dir ./nagios.SlackBuild -For a useful setup, you will want to have nagios-plugins installed. +For a useful setup, you will want to have monitoring-plugins installed. To configure nagios, some knowledge of httpd is required. Check the included 'README.SLACKWARE' file for some basic setup instructions. The include file diff --git a/network/nagios/nagios.SlackBuild b/network/nagios/nagios.SlackBuild index 1814152377..317d2741cb 100644 --- a/network/nagios/nagios.SlackBuild +++ b/network/nagios/nagios.SlackBuild @@ -3,7 +3,7 @@ # Slackware build script for nagios # Copyright 2009-2013 Niels Horn, Rio de Janeiro, RJ, Brazil -# Copyright 2014, 2015 Mario Preksavec, Zagreb, HR +# Copyright 2014, 2015 Mario Preksavec, Zagreb, Croatia # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -25,7 +25,7 @@ PRGNAM=nagios VERSION=${VERSION:-4.0.8} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then @@ -128,6 +128,10 @@ make install-exfoliation find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true +# Use monitoring-plugins instead of nagios-plugins +sed -i 's#\($USER1$=/usr/libexec/\)nagios#\1monitoring-plugins#' \ + $PKG/etc/nagios/resource.cfg + # Change configuration files to .new find $PKG/etc/$PRGNAM/ -name *.cfg | while read cfg ; do mv $cfg $cfg.new ; done mv $PKG/etc/httpd/extra/nagios.conf $PKG/etc/httpd/extra/nagios.conf.new