Module Name:	pkgsrc
Committed By:	lukem
Date:		Mon Oct 14 00:29:51 UTC 2002

Modified Files:
	pkgsrc/www/apache/files: apache.sh
	pkgsrc/www/apache2/files: apache.sh
	pkgsrc/www/apache6/files: apache.sh

Log Message:
Only set apache_start to "start" if it's not already set.

Previously, if apache_start was set in /etc/rc.conf and /etc/rc.d/apache was
loaded as part of the /etc/rc start sequence, apache_start's value would
be overridden by "apache_start=start" in this script, because /etc/rc.conf
would have already been loaded and load_rc_config() would not reload it again.

This problem would not have been seen if /etc/rc.d/apache was started
manually, or /etc/rc.conf.d/apache or @PKG_SYSCONFDIR@/apache_start.conf
was used to set apache_start.

(I am using /etc/rc.conf, and was wondering why apache wasn't starting
with ssl support at boot, but worked after a manual restart...)


To generate a diff of this commit:
cvs rdiff -r1.22 -r1.23 pkgsrc/www/apache/files/apache.sh
cvs rdiff -r1.6 -r1.7 pkgsrc/www/apache2/files/apache.sh
cvs rdiff -r1.16 -r1.17 pkgsrc/www/apache6/files/apache.sh

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.