| 1 |
commit: 889c598ac4275caf37f2f9473f6947b4b4d7c0fe |
| 2 |
Author: Michael Orlitzky <mjo <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Jan 21 15:25:46 2016 +0000 |
| 4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Mar 3 12:46:26 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/apache.git/commit/?id=889c598a |
| 7 |
|
| 8 |
apache2.initd: set the path to the apache2 binary once, globally. |
| 9 |
|
| 10 |
The $APACHE2 variable (containing the path to apache2) is currently |
| 11 |
set every time checkconfd() is called. Its value never changes, and |
| 12 |
the variable is already global, so we might as well set it once at the |
| 13 |
beginning of the script. |
| 14 |
|
| 15 |
2.4/init/apache2.initd | 4 +++- |
| 16 |
1 file changed, 3 insertions(+), 1 deletion(-) |
| 17 |
|
| 18 |
diff --git a/2.4/init/apache2.initd b/2.4/init/apache2.initd |
| 19 |
index 50b6500..c9d12c7 100755 |
| 20 |
--- a/2.4/init/apache2.initd |
| 21 |
+++ b/2.4/init/apache2.initd |
| 22 |
@@ -22,6 +22,9 @@ SERVERROOT="${SERVERROOT:-/usr/lib/apache2}" |
| 23 |
CONFIGFILE="${CONFIGFILE:-/etc/apache2/httpd.conf}" |
| 24 |
RELOAD_TYPE="${RELOAD_TYPE:-graceful}" |
| 25 |
|
| 26 |
+# The path to the apache2 binary. |
| 27 |
+APACHE2="/usr/sbin/apache2" |
| 28 |
+ |
| 29 |
depend() { |
| 30 |
need net |
| 31 |
use mysql dns logger netmount postgresql |
| 32 |
@@ -44,7 +47,6 @@ checkconfd() { |
| 33 |
APACHE2_OPTS="${APACHE2_OPTS} -f ${CONFIGFILE}" |
| 34 |
[ -n "${STARTUPERRORLOG}" ] && APACHE2_OPTS="${APACHE2_OPTS} -E ${STARTUPERRORLOG}" |
| 35 |
|
| 36 |
- APACHE2="/usr/sbin/apache2" |
| 37 |
} |
| 38 |
|
| 39 |
checkconfig() { |
Archives