From fa4672aee76a615d6e68e1edbc0fabfce995d893 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Arkadiusz=20Mi=C5=9Bkiewicz?= Date: Thu, 20 Sep 2018 14:05:10 +0200 Subject: [PATCH] - up to 3.2.1 --- nagios-nrpe-config.patch | 32 ++++++++++++++++++++++---------- nagios-nrpe.spec | 6 +++--- 2 files changed, 25 insertions(+), 13 deletions(-) diff --git a/nagios-nrpe-config.patch b/nagios-nrpe-config.patch index e94813e..b2d4fe4 100644 --- a/nagios-nrpe-config.patch +++ b/nagios-nrpe-config.patch @@ -1,13 +1,9 @@ ---- nrpe-3.2.0/sample-config/nrpe.cfg.in~ 2017-06-28 00:13:20.000000000 +0300 -+++ nrpe-3.2.0/sample-config/nrpe.cfg.in 2017-07-11 12:15:01.541380203 +0300 -@@ -281,80 +281,4 @@ - # INCLUDE CONFIG DIRECTORY - # This directive allows you to include definitions from config files (with a - # .cfg extension) in one or more directories (with recursion). -- --#include_dir= --#include_dir= -- +--- nrpe-3.2.1/sample-config/nrpe.cfg.in~ 2017-09-01 15:59:54.000000000 +0200 ++++ nrpe-3.2.1/sample-config/nrpe.cfg.in 2018-09-20 14:02:57.989524019 +0200 +@@ -270,92 +270,10 @@ connection_timeout=300 + + # nasty_metachars="|`&><'\\[]{};\r\n" + - - -# COMMAND DEFINITIONS @@ -81,4 +77,20 @@ -#command[check_asterisk_channels]=@pluginsdir@/nagisk.pl -c channels -#command[check_asterisk_zaptel]=@pluginsdir@/nagisk.pl -c zaptel -#command[check_asterisk_span]=@pluginsdir@/nagisk.pl -c span -s 1 +- +- +- +-# INCLUDE CONFIG FILE +-# This directive allows you to include definitions from an external config file. +- +-#include= +- +- +- + # INCLUDE CONFIG DIRECTORY + # This directive allows you to include definitions from config files (with a + # .cfg extension) in one or more directories (with recursion). + + #include_dir= + #include_dir= +include_dir=/etc/nagios/nrpe.d diff --git a/nagios-nrpe.spec b/nagios-nrpe.spec index 9b67d96..432db2a 100644 --- a/nagios-nrpe.spec +++ b/nagios-nrpe.spec @@ -1,12 +1,12 @@ Summary: Nagios remote plugin execution service/plugin Summary(pl.UTF-8): Demon i wtyczka zdalnego wywoływania wtyczek Nagios Name: nagios-nrpe -Version: 3.2.0 -Release: 3 +Version: 3.2.1 +Release: 1 License: GPL v2 Group: Networking Source0: http://downloads.sourceforge.net/nagios/nrpe-%{version}.tar.gz -# Source0-md5: 5c81355bcd8b9929ca904879075e1ff5 +# Source0-md5: 8997e195fea93cdceb8c7ed8ac1d43bc Source1: nrpe.init Source2: nrpe-command.cfg Source3: %{name}.tmpfiles -- 2.43.0