[gentoo-commits] proj/apache:master commit in: 2.4/init/

[Lars Wendler]

commit:     c5b868a72f9bd9709fcc2bb603e2ef4b148603b5
Author:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 21 15:49:17 2016 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Thu Mar  3 12:46:26 2016 +0000
URL:        https://gitweb.gentoo.org/proj/apache.git/commit/?id=c5b868a7

apache2.initd: set defaults for LYNX and STATUSURL once.

The default values for the LYNX and STATUSURL variables were set in
functions. Now that the other conf.d defaults are set at the beginning
of the script, it makes sense to set these there, too. The LYNX
default was set twice, in configdump() and fullstatus(), so this
eliminates some duplication.

 2.4/init/apache2.initd | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/2.4/init/apache2.initd b/2.4/init/apache2.initd
index ed9fdc5..de57251 100755
--- a/2.4/init/apache2.initd
+++ b/2.4/init/apache2.initd
@@ -20,6 +20,8 @@ PIDFILE="${PIDFILE:-/var/run/apache2.pid}"
 TIMEOUT=${TIMEOUT:-15}
 SERVERROOT="${SERVERROOT:-/usr/lib/apache2}"
 CONFIGFILE="${CONFIGFILE:-/etc/apache2/httpd.conf}"
+LYNX="${LYNX:-lynx -dump}"
+STATUSURL="${STATUSURL:-http://localhost/server-status}"
 RELOAD_TYPE="${RELOAD_TYPE:-graceful}"
 
 # Append the server root and configuration file parameters to the
@@ -149,9 +151,6 @@ modules() {
 }
 
 fullstatus() {
-	LYNX="${LYNX:-lynx -dump}"
-	STATUSURL="${STATUSURL:-http://localhost/server-status}"
-
 	if ! type -p $(set -- ${LYNX}; echo $1) 2>&1 >/dev/null; then
 		eerror "lynx not found! you need to emerge www-client/lynx"
 	else
@@ -165,7 +164,6 @@ virtualhosts() {
 }
 
 configdump() {
-	LYNX="${LYNX:-lynx -dump}"
 	INFOURL="${INFOURL:-http://localhost/server-info}"
 
 	checkconfd || return 1