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"