From f554cfdb78c9ed47d66ee4ab93bea12efa45027e Mon Sep 17 00:00:00 2001 From: Peter Pentchev Date: Mon, 26 Jul 2004 15:24:05 +0000 Subject: In the rc.d/localpkg New World Order, the apache.sh startup script may be executed when the apache_enable and other config variables have already been set, e.g. via /etc/rc.conf. In that case, load_rc_config will not do anything at all, and the "defaults" set in the script will override the user's settings. Fix this by honoring any previously-set config variables. Carte blanche by: ache (maintainer) --- www/apache13/files/apache.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'www/apache13/files/apache.sh') diff --git a/www/apache13/files/apache.sh b/www/apache13/files/apache.sh index 03e31dd16321..3e3cdff59aba 100644 --- a/www/apache13/files/apache.sh +++ b/www/apache13/files/apache.sh @@ -13,9 +13,9 @@ # # DO NOT CHANGE THESE DEFAULT VALUES HERE # -apache_enable="NO" -apache_flags="" -apache_pidfile="/var/run/httpd.pid" +apache_enable=${apache_enable-"NO"} +apache_flags=${apache_flags-""} +apache_pidfile=${apache_pidfile-"/var/run/httpd.pid"} . %%RC_SUBR%% -- cgit v1.2.3