diff options
| author | Stefan Fritsch <sf@debian.org> | 2008-03-12 16:59:41 +0000 |
|---|---|---|
| committer | Stefan Fritsch <sf@sfritsch.de> | 2012-01-02 10:36:51 +0100 |
| commit | c9403064214e9be0ec5be53e404280812f09fc3d (patch) | |
| tree | b687ebf27f64afc7892d163f6d2491a1cfa19002 | |
| parent | b9209fd62959696c63f88bae9613378c17cfd9f3 (diff) | |
| download | apache2-c9403064214e9be0ec5be53e404280812f09fc3d.tar.gz | |
more envvars for apache2ctl and fix a typo
git-svn-id: svn+ssh://svn.debian.org/svn/pkg-apache/trunk/apache2@609 01b336ce-410b-0410-9a02-a0e7f243c266
| -rw-r--r-- | debian/changelog | 8 | ||||
| -rwxr-xr-x | debian/patches/050_enhance_apache2ctl.dpatch | 6 |
2 files changed, 11 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog index c8b030f3..2a88fa0e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +apache2 (2.2.8-3) UNRELEASED; urgency=low + + * Introduce APACHE_RUN_DIR and APACHE_LOCK_DIR in apache2ctl. Also, make it + use APACHE_RUN_USER instead of APACHE2_RUN_USER, to be consistent with + apache2.conf. + + -- Stefan Fritsch <sf@debian.org> Wed, 12 Mar 2008 17:55:40 +0100 + apache2 (2.2.8-2) unstable; urgency=low * Provide a fallback access log (other_vhosts_access.log) and a suitable diff --git a/debian/patches/050_enhance_apache2ctl.dpatch b/debian/patches/050_enhance_apache2ctl.dpatch index 553f55b2..8fb8c80f 100755 --- a/debian/patches/050_enhance_apache2ctl.dpatch +++ b/debian/patches/050_enhance_apache2ctl.dpatch @@ -87,11 +87,11 @@ diff -urNad trunk~/support/apachectl.in trunk/support/apachectl.in -start|stop|restart|graceful|graceful-stop) - $HTTPD -k $ARGV +start) -+ mkdir -p /var/run/apache2 -+ install -d -o ${APACHE2_RUN_USER:-www-data} /var/lock/apache2 ++ mkdir -p ${APACHE_RUN_DIR:-/var/run/apache2} ++ install -d -o ${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 /var/run/apache2/*ssl_scache* ++ rm -f ${APACHE_RUN_DIR:-/var/run/apache2}/*ssl_scache* + $HTTPD ${APACHE_ARGUMENTS} -k $ARGV + ERROR=$? + ;; |