[Pkg-apache-commits] r1156 - in /trunk/apache2: apache2.2-common.apache2.init changelog

[sf at alioth.debian.org]

Author: sf
Date: Tue Mar  2 20:15:10 2010
New Revision: 1156

URL: http://svn.debian.org/wsvn/pkg-apache/?sc=1&rev=1156
Log:
Do a configcheck in the init script before doing a non-graceful restart

Modified:
    trunk/apache2/apache2.2-common.apache2.init
    trunk/apache2/changelog

Modified: trunk/apache2/apache2.2-common.apache2.init
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apache2/apache2.2-common.apache2.init?rev=1156&op=diff
==============================================================================
--- trunk/apache2/apache2.2-common.apache2.init (original)
+++ trunk/apache2/apache2.2-common.apache2.init Tue Mar  2 20:15:10 2010
@@ -224,6 +224,11 @@
                 fi
 	;;
 	restart)
+		if ! $APACHE2CTL configtest > /dev/null 2>&1; then
+		    $APACHE2CTL configtest || true
+		    log_end_msg 1
+		    exit 1
+		fi
 		if check_htcacheclean ; then
 			log_daemon_msg "Restarting web server" "htcacheclean"
 			stop_htcacheclean

Modified: trunk/apache2/changelog
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apache2/changelog?rev=1156&op=diff
==============================================================================
--- trunk/apache2/changelog (original)
+++ trunk/apache2/changelog Tue Mar  2 20:15:10 2010
@@ -2,6 +2,8 @@
 
   * Fix bash completion for a2ensite if the site name contains 'conf' or
     'load'. Closes: #572232
+  * Do a configcheck in the init script before doing a non-graceful restart.
+    Closes: #571461
 
  -- Stefan Fritsch <sf at debian.org>  Tue, 02 Mar 2010 20:56:18 +0100