[Pkg-apache-commits] r1109 - in /trunk/apache2: changelog config-dir/envvars control patches/050_enhance_apache2ctl.dpatch

[sf at alioth.debian.org]

Author: sf
Date: Sat Jan  2 16:58:54 2010
New Revision: 1109

URL: http://svn.debian.org/wsvn/pkg-apache/?sc=1&rev=1109
Log:
* Print a useful error message if 'apache2ctl status' fails. Add a comment
  to /etc/apache2/envvars on how to change the options for www-browser.
  Closes: #561496, #272069
* Point to README.backtrace in apache2-dbg's description.

Modified:
    trunk/apache2/changelog
    trunk/apache2/config-dir/envvars
    trunk/apache2/control
    trunk/apache2/patches/050_enhance_apache2ctl.dpatch

Modified: trunk/apache2/changelog
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apache2/changelog?rev=1109&op=diff
==============================================================================
--- trunk/apache2/changelog (original)
+++ trunk/apache2/changelog Sat Jan  2 16:58:54 2010
@@ -1,3 +1,12 @@
+apache2 (2.2.14-5) UNRELEASED; urgency=low
+
+  * Print a useful error message if 'apache2ctl status' fails. Add a comment
+    to /etc/apache2/envvars on how to change the options for www-browser.
+    Closes: #561496, #272069
+  * Point to README.backtrace in apache2-dbg's description.
+
+ -- Stefan Fritsch <sf at debian.org>  Sat, 02 Jan 2010 17:41:40 +0100
+
 apache2 (2.2.14-4) unstable; urgency=low
 
   * Disable localized error pages again by default because they break

Modified: trunk/apache2/config-dir/envvars
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apache2/config-dir/envvars?rev=1109&op=diff
==============================================================================
--- trunk/apache2/config-dir/envvars (original)
+++ trunk/apache2/config-dir/envvars Sat Jan  2 16:58:54 2010
@@ -13,3 +13,7 @@
 #. /etc/default/locale
 
 export LANG
+
+## The command to get the status for 'apache2ctl status'.
+## Some packages providing 'www-browser' need '--dump' instead of '-dump'.
+#export APACHE_LYNX='www-browser -dump'

Modified: trunk/apache2/control
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apache2/control?rev=1109&op=diff
==============================================================================
--- trunk/apache2/control (original)
+++ trunk/apache2/control Sat Jan  2 16:58:54 2010
@@ -199,3 +199,4 @@
 Depends: apache2.2-bin (= ${binary:Version})
 Description: Apache debugging symbols
  This package includes the debugging symbols for Apache 2.
+ See /usr/share/doc/apache2.2-common/README.backtrace for more information.

Modified: trunk/apache2/patches/050_enhance_apache2ctl.dpatch
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apache2/patches/050_enhance_apache2ctl.dpatch?rev=1109&op=diff
==============================================================================
--- trunk/apache2/patches/050_enhance_apache2ctl.dpatch (original)
+++ trunk/apache2/patches/050_enhance_apache2ctl.dpatch Sat Jan  2 16:58:54 2010
@@ -8,8 +8,8 @@
 
 @DPATCH@
 diff -urNad trunk~/support/apachectl.in trunk/support/apachectl.in
---- trunk~/support/apachectl.in	2009-05-17 10:18:07.998158064 +0200
-+++ trunk/support/apachectl.in	2009-05-17 10:22:03.232686445 +0200
+--- trunk~/support/apachectl.in	2010-01-02 17:51:49.480626116 +0100
++++ trunk/support/apachectl.in	2010-01-02 17:52:31.089347144 +0100
 @@ -40,28 +40,31 @@
  # |||||||||||||||||||| START CONFIGURATION SECTION  ||||||||||||||||||||
  # --------------------                              --------------------
@@ -50,7 +50,7 @@
  # --------------------                              --------------------
  # ||||||||||||||||||||   END CONFIGURATION SECTION  ||||||||||||||||||||
  
-@@ -71,13 +74,33 @@
+@@ -71,13 +74,42 @@
  fi
  
  ERROR=0
@@ -63,6 +63,15 @@
 +    exit 1
  fi
  
++get_status () {
++    if ! $LYNX $STATUSURL ; then
++        echo "'$LYNX $STATUSURL'" failed. >&2
++        echo Maybe you need to install a package providing www-browser or you >&2
++        echo need to adjust the APACHE_LYNX variable in /etc/apache2/envvars >&2
++        exit 1
++    fi
++}
++
  case $ARGV in
 -start|stop|restart|graceful|graceful-stop)
 -    $HTTPD -k $ARGV
@@ -88,7 +97,7 @@
      ERROR=$?
      ;;
  startssl|sslstart|start-SSL)
-@@ -87,7 +110,7 @@
+@@ -87,17 +119,17 @@
      ERROR=2
      ;;
  configtest)
@@ -97,8 +106,12 @@
      ERROR=$?
      ;;
  status)
-@@ -97,7 +120,7 @@
-     $LYNX $STATUSURL
+-    $LYNX $STATUSURL | awk ' /process$/ { print; exit } { print } '
++    get_status | awk ' /process$/ { print; exit } { print } '
+     ;;
+ fullstatus)
+-    $LYNX $STATUSURL
++    get_status
      ;;
  *)
 -    $HTTPD $ARGV