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

(-)apache24.in (-3 / +23 lines)
Lines 23-28 Link Here
23
#                             Set to yes to check for accf_http kernel
23
#                             Set to yes to check for accf_http kernel
24
#                             module on start up and load if not loaded.
24
#                             module on start up and load if not loaded.
25
# apache24_fib (str):	      Set an altered default network view for apache
25
# apache24_fib (str):	      Set an altered default network view for apache
26
# apache24_configcheck_disable (bool): Set to "YES" to disable sanity check on startup
26
27
27
. /etc/rc.subr
28
. /etc/rc.subr
28
29
Lines 46-51 Link Here
46
[ -z "$apache24limits_enable" ] && apache24limits_enable="NO"
47
[ -z "$apache24limits_enable" ] && apache24limits_enable="NO"
47
[ -z "$apache24limits_args" ]   && apache24limits_args="-e -C daemon"
48
[ -z "$apache24limits_args" ]   && apache24limits_args="-e -C daemon"
48
[ -z "$apache24_http_accept_enable" ] && apache24_http_accept_enable="NO"
49
[ -z "$apache24_http_accept_enable" ] && apache24_http_accept_enable="NO"
50
[ -z "$apache24_configcheck_disable" ] && apache24_configcheck_disable="NO"
49
51
50
apache24_accf()
52
apache24_accf()
51
{
53
{
Lines 75-80 Link Here
75
		eval apache24limits_enable="\${apache24limits_${profile}_enable:-${apache24limits_enable}}"
77
		eval apache24limits_enable="\${apache24limits_${profile}_enable:-${apache24limits_enable}}"
76
		eval apache24limits_args="\${apache24limits_${profile}_args:-${apache24limits_args}}"
78
		eval apache24limits_args="\${apache24limits_${profile}_args:-${apache24limits_args}}"
77
		eval apache24_fib="\${apache24_${profile}_fib:-${apache24_fib}}"
79
		eval apache24_fib="\${apache24_${profile}_fib:-${apache24_fib}}"
80
		eval apache24_configcheck_disable="\${apache24_${profile}_configcheck_disable:-${apache24_configcheck_disable}}"
78
		eval command="\${apache24_${profile}_command:-${command}}"
81
		eval command="\${apache24_${profile}_command:-${command}}"
79
		eval pidfile="\${apache24_${profile}_pidfile:-${pidfile}}"
82
		eval pidfile="\${apache24_${profile}_pidfile:-${pidfile}}"
80
		eval apache24_envvars="\${apache24_${profile}_envvars:-${envvars}}"
83
		eval apache24_envvars="\${apache24_${profile}_envvars:-${envvars}}"
Lines 123-132 Link Here
123
	apache24_accf
126
	apache24_accf
124
fi
127
fi
125
128
129
if checkyesno apache24_configcheck_disable
130
then
131
        unset restart_precmd
132
        unset reload_precmd
133
fi
134
126
apache24_requirepidfile()
135
apache24_requirepidfile()
127
{
136
{
128
    apache24_checkconfig
129
130
	if [ ! "0`check_pidfile ${pidfile} ${command}`" -gt 1 ]; then
137
	if [ ! "0`check_pidfile ${pidfile} ${command}`" -gt 1 ]; then
131
		echo "${name} not running? (check $pidfile)."
138
		echo "${name} not running? (check $pidfile)."
132
		exit 1
139
		exit 1
Lines 147-152 Link Here
147
apache24_graceful() {
154
apache24_graceful() {
148
	apache24_requirepidfile
155
	apache24_requirepidfile
149
156
157
	if ! checkyesno apache24_configcheck_disable
158
	then
159
		apache24_checkconfig
160
	fi
161
150
	echo "Performing a graceful restart"
162
	echo "Performing a graceful restart"
151
	eval ${command} ${apache24_flags} -k graceful
163
	eval ${command} ${apache24_flags} -k graceful
152
}
164
}
Lines 154-166 Link Here
154
apache24_gracefulstop() {
166
apache24_gracefulstop() {
155
	apache24_requirepidfile
167
	apache24_requirepidfile
156
168
169
	if ! checkyesno apache24_configcheck_disable
170
	then
171
		apache24_checkconfig
172
	fi
173
157
	echo "Performing a graceful stop"
174
	echo "Performing a graceful stop"
158
	eval ${command} ${apache24_flags} -k graceful-stop
175
	eval ${command} ${apache24_flags} -k graceful-stop
159
}
176
}
160
177
161
apache24_precmd()
178
apache24_precmd()
162
{
179
{
163
	apache24_checkconfig
180
	if ! checkyesno apache24_configcheck_disable
181
	then
182
		apache24_checkconfig
183
	fi
164
184
165
	if checkyesno apache24limits_enable
185
	if checkyesno apache24limits_enable
166
	then
186
	then

Return to bug 191398