diff options
| author |   Michael Orlitzky <mjo@gentoo.org> | 2016-01-21 10:49:17 -0500 |
|---|---|---|
| committer |   Lars Wendler <polynomial-c@gentoo.org> | 2016-03-03 13:46:26 +0100 |
| commit | c5b868a72f9bd9709fcc2bb603e2ef4b148603b5 (patch) | |
| tree | b16d816e8d39d8ed4cc65e06061170e1f25d2e6d | |
| parent | apache2.initd: replace deprecated name "runscript" with "openrc-run". (diff) | |
| download | apache-c5b868a72f9bd9709fcc2bb603e2ef4b148603b5.tar.gz apache-c5b868a72f9bd9709fcc2bb603e2ef4b148603b5.tar.bz2 apache-c5b868a72f9bd9709fcc2bb603e2ef4b148603b5.zip | |
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.
| -rwxr-xr-x | 2.4/init/apache2.initd | 6 |
1 files 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 |