aboutsummarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD6
-rw-r--r--nagios-nrpe-plugin.install12
3 files changed, 11 insertions, 9 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 7e18ab18880e..a2c719e96c93 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = nagios-nrpe-plugin
pkgdesc = The Nagios NRPE server side plugin.
pkgver = 2.15
- pkgrel = 3
+ pkgrel = 4
url = http://www.nagios.org
install = nagios-nrpe-plugin.install
arch = any
diff --git a/PKGBUILD b/PKGBUILD
index e50f28b226f5..4b093a6be44a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
pkgname=nagios-nrpe-plugin
pkgver=2.15
-pkgrel=3
+pkgrel=4
pkgdesc="The Nagios NRPE server side plugin."
license=('GPL')
arch=('any')
@@ -16,12 +16,12 @@ install=nagios-nrpe-plugin.install
build() {
cd ${srcdir}/nrpe-${pkgver}
- ./configure --prefix=/usr/lib/monitoring-plugins \
+ ./configure --prefix=/usr/share/nagios \
--with-nagios-user=nagios --with-nagios-group=nagios || return 1
make || return 1
}
package() {
cd ${srcdir}/nrpe-${pkgver}
- make prefix=${pkgdir}/usr/lib/monitoring-plugins install-plugin || return 1
+ make prefix=${pkgdir}/usr/share/nagios install-plugin || return 1
}
diff --git a/nagios-nrpe-plugin.install b/nagios-nrpe-plugin.install
index 40975dbc06b4..577e4639c0c7 100644
--- a/nagios-nrpe-plugin.install
+++ b/nagios-nrpe-plugin.install
@@ -1,9 +1,11 @@
post_install() {
- echo "check_nrpe has been moved to /usr/lib/monitoring-plugins to"
- echo "be consistent with the change from nagios-plugins to"
- echo "monitoring-plugins. You may need to tell nagios where the"
- echo "plugins are located, or symlink /usr/share/nagios/libexec to"
- echo "/usr/lib/monitoring-plugins."
+ echo "check_nrpe is now installed in /usr/share/nagios/libexec."
+ echo "If you are using monitoring-plugins, it is recommended"
+ echo "that /usr/share/nagios/libexec *not* be symlinked to"
+ echo "/usr/lib/monitoring-plugins. Instead, in /etc/nagios/resource.cfg"
+ echo "set $USER1$=/usr/lib/monitoring-plugins and in"
+ echo "/etc/nagios/objects/commands.cfg change the relevant lines to"
+ echo "to 'command_line /usr/share/nagios/libexec/check_nrpe ...'."
}
post_upgrade() {