diff --git a/nrpe-0003-Include-etc-npre.d-config-directory.patch b/nrpe-0003-Include-etc-npre.d-config-directory.patch new file mode 100644 index 0000000..e0fe98d --- /dev/null +++ b/nrpe-0003-Include-etc-npre.d-config-directory.patch @@ -0,0 +1,65 @@ +diff -up ./sample-config/nrpe.cfg.in.include_etc_npre_d ./sample-config/nrpe.cfg.in +--- ./sample-config/nrpe.cfg.in.include_etc_npre_d 2017-07-14 17:44:04.511051885 -0400 ++++ ./sample-config/nrpe.cfg.in 2017-07-14 17:46:55.255275288 -0400 +@@ -47,7 +47,10 @@ pid_file=@piddir@/nrpe.pid + # PORT NUMBER + # Port number we should wait for connections on. + # NOTE: This must be a non-privileged port (i.e. > 1024). +-# NOTE: This option is ignored if NRPE is running under either inetd or xinetd ++# NOTE: This option is ignored if NRPE is running under either inetd ++# or xinetd or via systemd. [In systemd please use ++# systemctl edit nrpe.service ++# to set up the port. + + server_port=@nrpe_port@ + +@@ -57,6 +60,7 @@ server_port=@nrpe_port@ + # Address that nrpe should bind to in case there are more than one interface + # and you do not want nrpe to bind on all interfaces. + # NOTE: This option is ignored if NRPE is running under either inetd or xinetd ++# or with systemd. Please start by hand. + + #server_address=127.0.0.1 + +@@ -74,7 +78,10 @@ server_port=@nrpe_port@ + # This determines the effective user that the NRPE daemon should run as. + # You can either supply a username or a UID. + # +-# NOTE: This option is ignored if NRPE is running under either inetd or xinetd ++# NOTE: This option is ignored if NRPE is running under either inetd ++# or xinetd or via systemd. [In systemd please use ++# systemctl edit nrpe.service ++# to set up the group. + + nrpe_user=@nrpe_user@ + +@@ -84,7 +91,10 @@ nrpe_user=@nrpe_user@ + # This determines the effective group that the NRPE daemon should run as. + # You can either supply a group name or a GID. + # +-# NOTE: This option is ignored if NRPE is running under either inetd or xinetd ++# NOTE: This option is ignored if NRPE is running under either inetd ++# or xinetd or via systemd. [In systemd please use ++# systemctl edit nrpe.service ++# to set up the user. + + nrpe_group=@nrpe_group@ + +@@ -101,7 +111,8 @@ nrpe_group=@nrpe_group@ + # file to allow only the specified host to connect to the port + # you are running this daemon on. + # +-# NOTE: This option is ignored if NRPE is running under either inetd or xinetd ++# NOTE: This option is ignored if NRPE is running under either inetd ++# or xinetd or systemd + + allowed_hosts=127.0.0.1,::1 + +@@ -359,3 +370,7 @@ command[check_total_procs]=@pluginsdir@/ + + #include_dir= + #include_dir= ++ ++include_dir=/etc/nrpe.d/ ++ ++ diff --git a/nrpe.spec b/nrpe.spec index 50d04f6..bd84535 100644 --- a/nrpe.spec +++ b/nrpe.spec @@ -5,7 +5,7 @@ Name: nrpe Version: 3.2.0 -Release: 1git%{?dist} +Release: 2git%{?dist} Summary: Host/service/network monitoring agent for Nagios Group: Applications/System @@ -20,6 +20,7 @@ Source5: nrpe.fc Source6: nrpe.service.epel Patch0: nrpe-0000-pre-nrpe321.patch +Patch3: nrpe-0003-Include-etc-npre.d-config-directory.patch Patch13: nrpe-0013-service-rhel6.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -94,7 +95,7 @@ SElinux context for %{name}. %prep %setup -q %patch0 -p1 -b .git20170714 - +%patch3 -p1 -b .include_etc_npre_d %patch13 -p1 -b .fix_service_rhel6 @@ -259,6 +260,9 @@ fi %endif %changelog +* Fri Jul 14 2017 Stephen Smoogen - 3.2.0-2git +- Remember to put in a patch so the /etc/nrpe.d/ is used. + * Fri Jul 14 2017 Stephen Smoogen - 3.2.0-1 - Update to 3.2.0 - Add patches for 321 openssl items