From owner-freebsd-bugs@FreeBSD.ORG Thu Sep 13 11:00:14 2007 Return-Path: Delivered-To: freebsd-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B191516A41A for ; Thu, 13 Sep 2007 11:00:14 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id A6E1A13C46B for ; Thu, 13 Sep 2007 11:00:14 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.1/8.14.1) with ESMTP id l8DB0EDq082108 for ; Thu, 13 Sep 2007 11:00:14 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.1/8.14.1/Submit) id l8DB0Eon082107; Thu, 13 Sep 2007 11:00:14 GMT (envelope-from gnats) Resent-Date: Thu, 13 Sep 2007 11:00:14 GMT Resent-Message-Id: <200709131100.l8DB0Eon082107@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Ruud Althuizen Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5848A16A418 for ; Thu, 13 Sep 2007 10:59:48 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21]) by mx1.freebsd.org (Postfix) with ESMTP id 5BACF13C45A for ; Thu, 13 Sep 2007 10:59:48 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (localhost [127.0.0.1]) by www.freebsd.org (8.14.1/8.14.1) with ESMTP id l8DAxlw2066802 for ; Thu, 13 Sep 2007 10:59:47 GMT (envelope-from nobody@www.freebsd.org) Received: (from nobody@localhost) by www.freebsd.org (8.14.1/8.14.1/Submit) id l8DAxl7c066801; Thu, 13 Sep 2007 10:59:47 GMT (envelope-from nobody) Message-Id: <200709131059.l8DAxl7c066801@www.freebsd.org> Date: Thu, 13 Sep 2007 10:59:47 GMT From: Ruud Althuizen To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Cc: Subject: misc/116329: apache20 rc-script doesn't always source %%PREFIX%%/sbin/envvars when needed X-BeenThere: freebsd-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 13 Sep 2007 11:00:14 -0000 >Number: 116329 >Category: misc >Synopsis: apache20 rc-script doesn't always source %%PREFIX%%/sbin/envvars when needed >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Thu Sep 13 11:00:14 GMT 2007 >Closed-Date: >Last-Modified: >Originator: Ruud Althuizen >Release: 6.2-PRERELEASE >Organization: >Environment: FreeBSD charm.il.fontys.nl 6.2-PRERELEASE FreeBSD 6.2-PRERELEASE #0: Mon Oct 2 20:21:05 CEST 2006 root@charm.il.fontys.nl:/usr/obj/usr/src/sys/IL_QUOTA i386 >Description: When you add *.env files to /usr/local/etc/apache2/envvars.d/ they only get sourced after start_cmd(). But apache2_checkconfig() also needs those includes. So I moved the lines. >How-To-Repeat: >Fix: Patch attached with submission follows: diff -Naur old/apache20/files/apache2.sh.in new/apache20/files/apache2.sh.in --- old/apache20/files/apache2.sh.in Thu Sep 13 12:46:40 2007 +++ new/apache20/files/apache2.sh.in Thu Sep 13 12:58:12 2007 @@ -98,11 +98,17 @@ apache2_checkconfig() { + if test -f %%PREFIX%%/sbin/envvars + then + . %%PREFIX%%/sbin/envvars + fi + echo "Performing sanity check on apache2 configuration:" eval ${command} ${apache2_flags} -t } -apache2_graceful() { +apache2_graceful() +{ apache2_requirepidfile echo "Performing a graceful restart" @@ -113,18 +119,12 @@ { apache2_checkconfig - if test -f %%PREFIX%%/sbin/envvars - then - . %%PREFIX%%/sbin/envvars - fi - if checkyesno apache2limits_enable then eval `/usr/bin/limits ${apache2limits_args}` 2>/dev/null else return 0 fi - } extra_commands="reload graceful configtest" >Release-Note: >Audit-Trail: >Unformatted: