diff options
| author | Clement Laforet <clement@FreeBSD.org> | 2004-08-23 15:44:51 +0000 |
|---|---|---|
| committer | Clement Laforet <clement@FreeBSD.org> | 2004-08-23 15:44:51 +0000 |
| commit | 83d8251d798527677fc4ffb53da4a63db0841f33 (patch) | |
| tree | a5edcaacfdf302f6bdf75e1423e0de31e96cc846 /www | |
| parent | Fix build with gcc-3.4 (diff) | |
- Add a sanity check on apache2 configuration files before reloading or
restarting apache2 (to avoid an expected failure on restart)
Notes
Notes:
svn path=/head/; revision=117133
Diffstat (limited to 'www')
| -rw-r--r-- | www/apache2/files/apache.sh | 8 | ||||
| -rw-r--r-- | www/apache20/files/apache.sh | 8 |
2 files changed, 16 insertions, 0 deletions
diff --git a/www/apache2/files/apache.sh b/www/apache2/files/apache.sh index 1fbc67d2d0a0..ff570a83a9c7 100644 --- a/www/apache2/files/apache.sh +++ b/www/apache2/files/apache.sh @@ -29,6 +29,8 @@ name="apache2" rcvar=`set_rcvar` start_precmd="apache2_precmd" +restart_precmd="apache2_checkconfig" +reload_precmd="apache2_checkconfig" command="%%PREFIX%%/sbin/httpd" pidfile="/var/run/httpd.pid" required_files=%%PREFIX%%/etc/apache2/httpd.conf @@ -44,6 +46,12 @@ load_rc_config $name checkyesno apache2ssl_enable && \ apache2_flags="-DSSL $apache2_flags" +apache2_checkconfig() +{ + echo "Performing sanity check on apache2 configuration:" + ${command} -t +} + apache2_precmd() { if test -f %%PREFIX%%/sbin/envvars diff --git a/www/apache20/files/apache.sh b/www/apache20/files/apache.sh index 1fbc67d2d0a0..ff570a83a9c7 100644 --- a/www/apache20/files/apache.sh +++ b/www/apache20/files/apache.sh @@ -29,6 +29,8 @@ name="apache2" rcvar=`set_rcvar` start_precmd="apache2_precmd" +restart_precmd="apache2_checkconfig" +reload_precmd="apache2_checkconfig" command="%%PREFIX%%/sbin/httpd" pidfile="/var/run/httpd.pid" required_files=%%PREFIX%%/etc/apache2/httpd.conf @@ -44,6 +46,12 @@ load_rc_config $name checkyesno apache2ssl_enable && \ apache2_flags="-DSSL $apache2_flags" +apache2_checkconfig() +{ + echo "Performing sanity check on apache2 configuration:" + ${command} -t +} + apache2_precmd() { if test -f %%PREFIX%%/sbin/envvars |