diff options
| author | Stefan Fritsch <sf@sfritsch.de> | 2016-11-13 12:09:12 +0100 |
|---|---|---|
| committer | Stefan Fritsch <sf@sfritsch.de> | 2016-11-13 12:17:55 +0100 |
| commit | 5193a1ce883b0fc0676767a2fc91d64dac98c46a (patch) | |
| tree | c7b7e8a88241d554b678bcc7cfc046f2e6f36922 | |
| parent | 10dec9a44d46c0a49a67797541b079e56287e6b2 (diff) | |
| download | apache2-5193a1ce883b0fc0676767a2fc91d64dac98c46a.tar.gz | |
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.
| -rw-r--r-- | debian/changelog | 3 | ||||
| -rw-r--r-- | debian/config-dir/apache2.conf.in | 6 | ||||
| -rw-r--r-- | debian/config-dir/envvars | 2 |
3 files changed, 10 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index e6ac4e86..b57e4349 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@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 22e8cc42..72220aab 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 91328ac7..708d1706 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. |