From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 086F01388C1 for ; Thu, 3 Mar 2016 13:03:30 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6A3B821C023; Thu, 3 Mar 2016 13:03:24 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id CE6D321C00A for ; Thu, 3 Mar 2016 13:03:22 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id BB4FA340C03 for ; Thu, 3 Mar 2016 13:03:21 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4E7E4209C for ; Thu, 3 Mar 2016 13:03:17 +0000 (UTC) From: "Lars Wendler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" Message-ID: <1457009186.c5b868a72f9bd9709fcc2bb603e2ef4b148603b5.polynomial-c@gentoo> Subject: [gentoo-commits] proj/apache:master commit in: 2.4/init/ X-VCS-Repository: proj/apache X-VCS-Files: 2.4/init/apache2.initd X-VCS-Directories: 2.4/init/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: c5b868a72f9bd9709fcc2bb603e2ef4b148603b5 X-VCS-Branch: master Date: Thu, 3 Mar 2016 13:03:17 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: db1f6a1f-d6e5-4d29-bce8-1736835fc531 X-Archives-Hash: 640d10d4407ba518647f811138a99aaa commit: c5b868a72f9bd9709fcc2bb603e2ef4b148603b5 Author: Michael Orlitzky gentoo org> AuthorDate: Thu Jan 21 15:49:17 2016 +0000 Commit: Lars Wendler gentoo 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