[apache2] 02/02: source /etc/default/apache-htcacheclean in init script

[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 326b40c4b262250bc6de3116d4ebd95a95b713fb
Author: Stefan Fritsch <sf at sfritsch.de>
Date:   Mon Aug 7 03:14:51 2017 +0200

    source /etc/default/apache-htcacheclean in init script
---
 debian/apache2.apache-htcacheclean.init | 7 +++++++
 debian/changelog                        | 2 ++
 2 files changed, 9 insertions(+)

diff --git a/debian/apache2.apache-htcacheclean.init b/debian/apache2.apache-htcacheclean.init
index a704321..c7f7f94 100755
--- a/debian/apache2.apache-htcacheclean.init
+++ b/debian/apache2.apache-htcacheclean.init
@@ -30,6 +30,13 @@ HTCACHECLEAN_DAEMON_INTERVAL="${HTCACHECLEAN_DAEMON_INTERVAL:=120}"
 HTCACHECLEAN_PATH="${HTCACHECLEAN_PATH:=/var/cache/apache2$DIR_SUFFIX/mod_cache_disk}"
 HTCACHECLEAN_OPTIONS="${HTCACHECLEAN_OPTIONS:=-n}"
 
+# Read configuration variable file if it is present
+if [ -f /etc/default/apache-htcacheclean$DIR_SUFFIX ] ; then
+       . /etc/default/apache-htcacheclean$DIR_SUFFIX
+elif [ -f /etc/default/apache-htcacheclean ] ; then
+       . /etc/default/apache-htcacheclean
+fi
+
 PIDDIR="/var/run/apache2/$RUN_USER"
 PIDFILE="$PIDDIR/$NAME.pid"
 DAEMON_ARGS="$HTCACHECLEAN_OPTIONS \
diff --git a/debian/changelog b/debian/changelog
index 1334e0d..dbdb8e5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,8 @@ apache2 (2.4.27-4) UNRELEASED; urgency=medium
   * Also remove -DBUILD_DATETIME and -fdebug-prefix-map from config_vars.mk
     to avoid them being used by apxs.
   * deflate.conf: Remove mention of MSIE6
+  * Make the apache-htcacheclean init script actually look into
+    /etc/default/apache-htcacheclean for its config. LP: #1691495
 
  -- Stefan Fritsch <sf at debian.org>  Sat, 05 Aug 2017 20:59:48 +0200
 

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