[apache2] 01/02: Remove possiblity to override apache2 path via envvars

[Stefan Fritsch]

This is an automated email from the git hooks/post-receive script.

sf pushed a commit to branch master
in repository apache2.

commit ff09077037cf19631b43e72220f34f3fdab61a3c
Author: Stefan Fritsch <sf at sfritsch.de>
Date:   Sun Sep 1 15:10:14 2013 +0200

    Remove possiblity to override apache2 path via envvars
    
    This is no longer necessary with MPMs as modules.
---
 debian/apache2.init |   11 +++--------
 debian/changelog    |    7 +++++++
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/debian/apache2.init b/debian/apache2.init
index 94c8ec4..e0d918e 100755
--- a/debian/apache2.init
+++ b/debian/apache2.init
@@ -54,11 +54,6 @@ HTCACHECLEAN_DAEMON_INTERVAL=120
 HTCACHECLEAN_PATH=/var/cache/apache2$DIR_SUFFIX/mod_cache_disk
 HTCACHECLEAN_OPTIONS=""
 
-APACHE_HTTPD=$(. $APACHE_ENVVARS && echo $APACHE_HTTPD)
-if [ -z "$APACHE_HTTPD" ] ; then
-	APACHE_HTTPD=/usr/sbin/apache2
-fi
-
 # Read configuration variable file if it is present
 if [ -f /etc/default/apache2$DIR_SUFFIX ] ; then
 	. /etc/default/apache2$DIR_SUFFIX
@@ -279,10 +274,10 @@ stop_htcacheclean() {
 
 
 # Sanity checks. They need to occur after function declarations
-[ -x $APACHE_HTTPD ] || exit 0
+[ -x $DAEMON ] || exit 0
 
-if [ ! -x $APACHE_HTTPD ] ; then
-	echo "No apache MPM package installed"
+if [ ! -x $DAEMON ] ; then
+	echo "No apache-bin package installed"
 	exit 0
 fi
 
diff --git a/debian/changelog b/debian/changelog
index ff0b1bd..224931a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+apache2 (2.4.6-4) UNRELEASED; urgency=low
+
+  * Remove possiblity to override path to apache2 executable via envvars.
+    This is no longer necessary with MPMs as modules.
+
+ -- Stefan Fritsch <sf at debian.org>  Sun, 01 Sep 2013 15:09:06 +0200
+
 apache2 (2.4.6-3) unstable; urgency=low
 
   * Fix 'implicit declaration' compiler warnings.

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-apache/apache2.git