Debian Codegraph @

contrib/epel-patches/nagios-0001-default-init.patch

raw
1 diff -up ./startup/default-init.in.fix_el6_init ./startup/default-init.in
2 --- ./startup/default-init.in.fix_el6_init 2019-01-15 09:58:00.000000000 -0500
3 +++ ./startup/default-init.in 2019-02-05 09:38:09.463144849 -0500
4 @@ -1,6 +1,6 @@
5 #!/bin/sh
6 #
7 -# chkconfig: 345 99 01
8 +# chkconfig: - 99 01
9 # description: Nagios network monitor
10 # processname: nagios
11 # File : nagios
12 @@ -24,6 +24,9 @@
13 # - Clean out redhat macros and other dependencies
14 # 2003-01-11 Ethan Galstad <[email protected]>
15 # - Updated su syntax (Gary Miller)
16 +# 2018-11-28 Justin Paulsen <[email protected]>
17 +# - Patched for EPEL release of Nagioscore 4.4.2
18 +# - - nagios-0001-default-init.patch
19 #
20 # Description: Starts and stops the Nagios monitor
21 # used to provide network services status.
22 @@ -91,12 +94,12 @@ check_config ()
23 echo "ERROR: Could not delete '$NagiosCfgtestFile'"
24 exit 8
25 fi
26 - if ! su $NagiosUser -c "touch $NagiosCfgtestFile"; then
27 + if ! su $NagiosUser -c "touch $NagiosCfgtestFile" -s /bin/sh ; then
28 echo "ERROR: Could not create or update '$NagiosCfgtestFile'"
29 exit 8
30 fi
31
32 - TMPFILE=$(mktemp /tmp/.configtest.XXXXXXXX)
33 + TMPFILE=$(mktemp $NagiosCfgtestFile.XXX)
34 $NagiosBin -vp $NagiosCfgFile > "$TMPFILE"
35 WARN=`grep ^"Total Warnings:" "$TMPFILE" |awk -F: '{print \$2}' |sed s/' '//g`
36 ERR=`grep ^"Total Errors:" "$TMPFILE" |awk -F: '{print \$2}' |sed s/' '//g`
37 @@ -138,11 +141,14 @@ status_nagios ()
38
39 printstatus_nagios ()
40 {
41 - if status_nagios; then
42 + status_nagios $1 $2
43 + RETVAL=$?
44 + if [ $RETVAL = 0 ]; then
45 echo "nagios (pid $NagiosPID) is running..."
46 else
47 echo "nagios is not running"
48 fi
49 + return $RETVAL
50 }
51
52 killproc_nagios ()
53 @@ -157,7 +163,17 @@ pid_nagios ()
54 return 1
55 fi
56
57 - NagiosPID=`head -n 1 $NagiosRunFile`
58 + export NagiosPID=`head -n 1 $NagiosRunFile`
59 + if [[ -z "$NagiosPID" ]]; then
60 + echo "No usable PID found in $NagiosRunFile"
61 + exit 1
62 + fi
63 +
64 + regex='^[0-9]+$'
65 + if ! [[ $NagiosPID =~ $regex ]]; then
66 + echo "PID not number found in $NagiosRunFile"
67 + exit 1
68 + fi
69 }
70
71 # Check that nagios exists.
72 @@ -188,7 +204,7 @@ case "$1" in
73 fi
74 fi
75
76 - su $NagiosUser -c "touch $NagiosVarDir/nagios.log $NagiosRetentionFile"
77 + su $NagiosUser -c "touch $NagiosVarDir/nagios.log $NagiosRetentionFile" -s /bin/sh
78 @BIN_RM@ -f $NagiosCommandFile
79 touch $NagiosRunFile
80 $NagiosBin -d $NagiosCfgFile
81 @@ -281,6 +297,7 @@ case "$1" in
82 *)
83 echo "Usage: nagios {start|stop|restart|reload|force-reload|status|checkconfig|configtest}"
84 exit 1
85 + exit 2
86 ;;
87
88 esac