You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by mi...@apache.org on 2012/07/21 15:30:56 UTC
svn commit: r1364084 - in /httpd/httpd/branches/2.4.x: ./
build/rpm/httpd.init
Author: minfrin
Date: Sat Jul 21 13:30:56 2012
New Revision: 1364084
URL: http://svn.apache.org/viewvc?rev=1364084&view=rev
Log:
Backport 1363829:
RPM packaging: The PID file goes in /var/run in the RPM layout.
Modified:
httpd/httpd/branches/2.4.x/ (props changed)
httpd/httpd/branches/2.4.x/build/rpm/httpd.init
Propchange: httpd/httpd/branches/2.4.x/
------------------------------------------------------------------------------
Merged /httpd/httpd/trunk:r1363829
Modified: httpd/httpd/branches/2.4.x/build/rpm/httpd.init
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/build/rpm/httpd.init?rev=1364084&r1=1364083&r2=1364084&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/build/rpm/httpd.init (original)
+++ httpd/httpd/branches/2.4.x/build/rpm/httpd.init Sat Jul 21 13:30:56 2012
@@ -22,7 +22,7 @@
# description: The Apache HTTP Server is an efficient and extensible \
# server implementing the current HTTP standards.
# processname: httpd
-# pidfile: /var/log/httpd/httpd.pid
+# pidfile: /var/run/httpd.pid
# config: /etc/sysconfig/httpd
#
### BEGIN INIT INFO
@@ -58,7 +58,7 @@ INITLOG_ARGS=""
# work correctly with a thread-based MPM; notably PHP will refuse to start.
httpd=${HTTPD-/usr/sbin/httpd}
-pidfile=${PIDFILE-/var/log/httpd/${prog}.pid}
+pidfile=${PIDFILE-/var/run/${prog}.pid}
lockfile=${LOCKFILE-/var/lock/subsys/${prog}}
RETVAL=0