[Pkg-apache-commits] r1143 - in /trunk/apache2/config-dir: apache2.conf envvars mods-available/cgid.conf mods-available/dav_fs.conf mods-available/ssl.conf

[sf at alioth.debian.org]

Author: sf
Date: Sun Feb  7 10:06:12 2010
New Revision: 1143

URL: http://svn.debian.org/wsvn/pkg-apache/?sc=1&rev=1143
Log:
use envvars for APACHE_RUN_DIR and APACHE_LOCK_DIR

Modified:
    trunk/apache2/config-dir/apache2.conf
    trunk/apache2/config-dir/envvars
    trunk/apache2/config-dir/mods-available/cgid.conf
    trunk/apache2/config-dir/mods-available/dav_fs.conf
    trunk/apache2/config-dir/mods-available/ssl.conf

Modified: trunk/apache2/config-dir/apache2.conf
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apache2/config-dir/apache2.conf?rev=1143&op=diff
==============================================================================
--- trunk/apache2/config-dir/apache2.conf (original)
+++ trunk/apache2/config-dir/apache2.conf Sun Feb  7 10:06:12 2010
@@ -52,7 +52,7 @@
 #
 # The accept serialization lock file MUST BE STORED ON A LOCAL DISK.
 #
-LockFile /var/lock/apache2/accept.lock
+LockFile ${APACHE_LOCK_DIR}/accept.lock
 
 #
 # PidFile: The file in which the server should record its process

Modified: trunk/apache2/config-dir/envvars
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apache2/config-dir/envvars?rev=1143&op=diff
==============================================================================
--- trunk/apache2/config-dir/envvars (original)
+++ trunk/apache2/config-dir/envvars Sun Feb  7 10:06:12 2010
@@ -2,13 +2,22 @@
 
 # this won't be correct after changing uid
 unset HOME
+
+# for supporting multiple apache2 instances
+if [ "${APACHE_CONFDIR##/etc/apache2-}" != "${APACHE_CONFDIR}" ] ; then
+	SUFFIX="-${APACHE_CONFDIR##/etc/apache2-}"
+else
+	SUFFIX=
+fi
 
 # Since there is no sane way to get the parsed apache2 config in scripts, some
 # settings are defined via environment variables and then used in apache2ctl,
 # /etc/init.d/apache2, /etc/logrotate.d/apache2, etc.
 export APACHE_RUN_USER=www-data
 export APACHE_RUN_GROUP=www-data
-export APACHE_PID_FILE=/var/run/apache2.pid
+export APACHE_PID_FILE=/var/run/apache2$SUFFIX.pid
+export APACHE_RUN_DIR=/var/run/apache2$SUFFIX
+export APACHE_LOCK_DIR=/var/lock/apache2$SUFFIX
 
 ## The locale used by some modules like mod_dav
 export LANG=C

Modified: trunk/apache2/config-dir/mods-available/cgid.conf
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apache2/config-dir/mods-available/cgid.conf?rev=1143&op=diff
==============================================================================
--- trunk/apache2/config-dir/mods-available/cgid.conf (original)
+++ trunk/apache2/config-dir/mods-available/cgid.conf Sun Feb  7 10:06:12 2010
@@ -1,2 +1,2 @@
 # Socket for cgid communication
-ScriptSock /var/run/apache2/cgisock
+ScriptSock ${APACHE_RUN_DIR}/cgisock

Modified: trunk/apache2/config-dir/mods-available/dav_fs.conf
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apache2/config-dir/mods-available/dav_fs.conf?rev=1143&op=diff
==============================================================================
--- trunk/apache2/config-dir/mods-available/dav_fs.conf (original)
+++ trunk/apache2/config-dir/mods-available/dav_fs.conf Sun Feb  7 10:06:12 2010
@@ -1,1 +1,1 @@
-DAVLockDB /var/lock/apache2/DAVLock
+DAVLockDB ${APACHE_LOCK_DIR}/DAVLock

Modified: trunk/apache2/config-dir/mods-available/ssl.conf
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apache2/config-dir/mods-available/ssl.conf?rev=1143&op=diff
==============================================================================
--- trunk/apache2/config-dir/mods-available/ssl.conf (original)
+++ trunk/apache2/config-dir/mods-available/ssl.conf Sun Feb  7 10:06:12 2010
@@ -38,14 +38,15 @@
 #   Inter-Process Session Cache:
 #   Configure the SSL Session Cache: First the mechanism 
 #   to use and second the expiring timeout (in seconds).
-#SSLSessionCache         dbm:/var/run/apache2/ssl_scache
-SSLSessionCache        shmcb:/var/run/apache2/ssl_scache(512000)
+#   (The mechanism dbm has known memory leaks and should not be used).
+#SSLSessionCache         dbm:${APACHE_RUN_DIR}/ssl_scache
+SSLSessionCache        shmcb:${APACHE_RUN_DIR}/ssl_scache(512000)
 SSLSessionCacheTimeout  300
 
 #   Semaphore:
 #   Configure the path to the mutual exclusion semaphore the
 #   SSL engine uses internally for inter-process synchronization. 
-SSLMutex  file:/var/run/apache2/ssl_mutex
+SSLMutex  file:${APACHE_RUN_DIR}/ssl_mutex
 
 #   SSL Cipher Suite:
 #   List the ciphers that the client is permitted to negotiate.