View | Details | Raw Unified | Return to bug 6437
Collapse All | Expand All

(-)/etc/sysconfig/httpd (+5 lines)
Line 0 Link Here
1
# If you want to force proxied:
2
#	for proxied Apache2 mode - you could add -DA1PROXIED
3
#	for proxied httpd-perl  mode - you could add -DPERLPROXIED
4
DEFINE="-DPERLPROXIED"
5
(-)/etc/rc.d/init.d/httpd (-3 / +6 lines)
Lines 13-18 Link Here
13
13
14
# Source function library.
14
# Source function library.
15
. /etc/init.d/functions
15
. /etc/init.d/functions
16
if [ -f /etc/sysconfig/httpd ]; then
17
        . /etc/sysconfig/httpd
18
fi
16
19
17
BINARY=/usr/sbin/httpd
20
BINARY=/usr/sbin/httpd
18
PIDFILE=/var/run/httpd.pid
21
PIDFILE=/var/run/httpd.pid
Lines 63-69 Link Here
63
		fi
66
		fi
64
	fi
67
	fi
65
	start_daemon --pidfile "$PIDFILE" --lockfile "$LOCKFILE" \
68
	start_daemon --pidfile "$PIDFILE" --lockfile "$LOCKFILE" \
66
		--expect-user root --name libhttpd.ep -- httpd
69
		--expect-user root --name libhttpd.ep -- "$BINARY" $DEFINE
67
	RETVAL=$?
70
	RETVAL=$?
68
	return $RETVAL
71
	return $RETVAL
69
}
72
}
Lines 71-77 Link Here
71
stop()
74
stop()
72
{
75
{
73
	stop_daemon --pidfile "$PIDFILE" --lockfile "$LOCKFILE" \
76
	stop_daemon --pidfile "$PIDFILE" --lockfile "$LOCKFILE" \
74
		--expect-user root --name libhttpd.ep -- httpd
77
		--expect-user root --name libhttpd.ep -- "$BINARY" $DEFINE
75
	if [ "$1" != "nocheck" -a -f "$PERLPIDFILE" ]; then
78
	if [ "$1" != "nocheck" -a -f "$PERLPIDFILE" ]; then
76
		echo "Warning: httpd-perl is running, check 'service httpd-perl extendedstatus'"
79
		echo "Warning: httpd-perl is running, check 'service httpd-perl extendedstatus'"
77
		passed "httpd-perl already running"
80
		passed "httpd-perl already running"
Lines 84-90 Link Here
84
{
87
{
85
	msg_reloading httpd
88
	msg_reloading httpd
86
	stop_daemon --pidfile "$PIDFILE" \
89
	stop_daemon --pidfile "$PIDFILE" \
87
		--expect-user root --name libhttpd.ep -HUP -- httpd
90
		--expect-user root --name libhttpd.ep -HUP -- "$BINARY" $DEFINE
88
	RETVAL=$?
91
	RETVAL=$?
89
	return $RETVAL
92
	return $RETVAL
90
} 
93
} 

Return to bug 6437