summaryrefslogtreecommitdiff
path: root/2.4
diff options
context:
space:
mode:
Diffstat (limited to '2.4')
-rwxr-xr-x2.4/init/apache2.initd8
1 files changed, 5 insertions, 3 deletions
diff --git a/2.4/init/apache2.initd b/2.4/init/apache2.initd
index 6320f1a..e81fa59 100755
--- a/2.4/init/apache2.initd
+++ b/2.4/init/apache2.initd
@@ -22,6 +22,11 @@ SERVERROOT="${SERVERROOT:-/usr/lib/apache2}"
CONFIGFILE="${CONFIGFILE:-/etc/apache2/httpd.conf}"
RELOAD_TYPE="${RELOAD_TYPE:-graceful}"
+# Append the server root and configuration file parameters to the
+# user's APACHE2_OPTS.
+APACHE2_OPTS="${APACHE2_OPTS} -d ${SERVERROOT}"
+APACHE2_OPTS="${APACHE2_OPTS} -f ${CONFIGFILE}"
+
# The path to the apache2 binary.
APACHE2="/usr/sbin/apache2"
@@ -42,9 +47,6 @@ checkconfd() {
eerror "SERVERROOT does not exist: ${SERVERROOT}"
return 1
fi
-
- APACHE2_OPTS="${APACHE2_OPTS} -d ${SERVERROOT}"
- APACHE2_OPTS="${APACHE2_OPTS} -f ${CONFIGFILE}"
}
checkconfig() {