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

[sf at alioth.debian.org]

Author: sf
Date: Sat Jan  9 20:15:16 2010
New Revision: 1119

URL: http://svn.debian.org/wsvn/pkg-apache/?sc=1&rev=1119
Log:
Add new init script action graceful-stop (LP: #456381)

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=1119&op=diff
==============================================================================
--- trunk/apache2/apache2.2-common.apache2.init (original)
+++ trunk/apache2/apache2.2-common.apache2.init Sat Jan  9 20:15:16 2010
@@ -163,6 +163,20 @@
                         log_end_msg 1
                 fi
 	;;
+	graceful-stop)
+		if check_htcacheclean ; then
+			log_daemon_msg "Stopping web server" "htcacheclean"
+			stop_htcacheclean
+			log_progress_msg "apache2"
+		else
+			log_daemon_msg "Stopping web server" "apache2"
+		fi
+		if $APACHE2CTL graceful-stop; then
+                        log_end_msg 0
+                else
+                        log_end_msg 1
+                fi
+	;;
 	reload | force-reload)
 		if ! $APACHE2CTL configtest > /dev/null 2>&1; then
                     $APACHE2CTL configtest || true
@@ -220,7 +234,7 @@
 		fi
 	;;
 	*)
-		log_success_msg "Usage: /etc/init.d/apache2 {start|stop|restart|reload|force-reload|start-htcacheclean|stop-htcacheclean|status}"
+		log_success_msg "Usage: /etc/init.d/apache2 {start|stop|graceful-stop|restart|reload|force-reload|start-htcacheclean|stop-htcacheclean|status}"
 		exit 1
 	;;
 esac

Modified: trunk/apache2/changelog
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apache2/changelog?rev=1119&op=diff
==============================================================================
--- trunk/apache2/changelog (original)
+++ trunk/apache2/changelog Sat Jan  9 20:15:16 2010
@@ -1,6 +1,7 @@
 apache2 (2.2.14-6) UNRELEASED; urgency=low
 
   * Move ab and logresolve from /usr/sbin to /usr/bin. Closes: #351450, #564061
+  * Add new init script action graceful-stop (LP: #456381)
 
  -- Stefan Fritsch <sf at debian.org>  Sat, 09 Jan 2010 13:11:11 +0100