[apache2] 03/04: multi-instance: Move stuff to /var/run/apache2-xxx

[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 5193a1ce883b0fc0676767a2fc91d64dac98c46a
Author: Stefan Fritsch <sf at sfritsch.de>
Date:   Sun Nov 13 12:09:12 2016 +0100

    multi-instance: Move stuff to /var/run/apache2-xxx
    
    /var/run/apache2 may not be created if the default apache2 instance is
    not started. Make sure that nothing uses it.
---
 debian/changelog                  | 3 +++
 debian/config-dir/apache2.conf.in | 6 ++++++
 debian/config-dir/envvars         | 2 +-
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index e6ac4e8..b57e434 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,9 @@
 apache2 (2.4.23-7) UNRELEASED; urgency=medium
 
   * Make apache2-dev depend on openssl 1.0, too. Closes: #844160
+  * Move DefaultRuntimeDir and pid file for multi-instances to
+    /var/run/apache2-xxx. Thanks to Horst Platz for the debugging.
+    Closes: #838932 LP: #1627339
   * Tweak embedded .tar.gz some more to build reproducibly.
 
  -- Stefan Fritsch <sf at debian.org>  Sun, 13 Nov 2016 11:06:36 +0100
diff --git a/debian/config-dir/apache2.conf.in b/debian/config-dir/apache2.conf.in
index 22e8cc4..72220aa 100644
--- a/debian/config-dir/apache2.conf.in
+++ b/debian/config-dir/apache2.conf.in
@@ -74,6 +74,12 @@
 ___MUTEX___Mutex file:${APACHE_LOCK_DIR} default
 
 #
+# The directory where shm and other runtime files will be stored.
+#
+
+DefaultRuntimeDir ${APACHE_RUN_DIR}
+
+#
 # PidFile: The file in which the server should record its process
 # identification number when it starts.
 # This needs to be set in /etc/apache2/envvars
diff --git a/debian/config-dir/envvars b/debian/config-dir/envvars
index 91328ac..708d170 100644
--- a/debian/config-dir/envvars
+++ b/debian/config-dir/envvars
@@ -16,7 +16,7 @@ fi
 export APACHE_RUN_USER=www-data
 export APACHE_RUN_GROUP=www-data
 # temporary state file location. This might be changed to /run in Wheezy+1
-export APACHE_PID_FILE=/var/run/apache2/apache2$SUFFIX.pid
+export APACHE_PID_FILE=/var/run/apache2$SUFFIX/apache2.pid
 export APACHE_RUN_DIR=/var/run/apache2$SUFFIX
 export APACHE_LOCK_DIR=/var/lock/apache2$SUFFIX
 # Only /var/log/apache2 is handled by /etc/logrotate.d/apache2.

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