[apache2] 01/02: make apache2ctl always create the necessary dirs

[Stefan Fritsch]

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

sf pushed a commit to branch wheezy
in repository apache2.

commit 727b22e383df27979b9a13d96473e79f87ac606d
Author: Stefan Fritsch <sf at sfritsch.de>
Date:   Sun Jan 26 13:18:22 2014 +0100

    make apache2ctl always create the necessary dirs
---
 debian/apache2ctl | 4 ++--
 debian/changelog  | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/debian/apache2ctl b/debian/apache2ctl
index 289d0b5..7ae867f 100755
--- a/debian/apache2ctl
+++ b/debian/apache2ctl
@@ -129,10 +129,10 @@ mkdir_chown () {
     fi
 }
 
+mkdir -p ${APACHE_RUN_DIR:-/var/run/apache2}
+mkdir_chown ${APACHE_RUN_USER:-www-data} ${APACHE_LOCK_DIR:-/var/lock/apache2}
 case $ARGV in
 start)
-    mkdir -p ${APACHE_RUN_DIR:-/var/run/apache2}
-    mkdir_chown ${APACHE_RUN_USER:-www-data} ${APACHE_LOCK_DIR:-/var/lock/apache2}
     # ssl_scache shouldn't be here if we're just starting up.
     # (this is bad if there are several apache2 instances running)
     rm -f ${APACHE_RUN_DIR:-/var/run/apache2}/*ssl_scache*
diff --git a/debian/changelog b/debian/changelog
index f12ba30..bcf10be 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,7 @@
 apache2 (2.2.22-13+wheezy1) UNRELEASED; urgency=low
 
+  * Make apache2ctl create the necessary directories even if started with
+    special options for apache2. Closes: #731531
   * Adjust paragraph in README.Debian about MaxMemFree not working properly.
     The issue has been fixed with apr 1.4.5-1.
 

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