Commit b3e1286d authored by Joshua Slive's avatar Joshua Slive
Browse files

An idea for solving the LockFile/PidFile issue by putting 

them both in extra/httpd-mpm.conf, but including a comment
in the main file on when they will need to be changed.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/simple-conf@160172 13f79535-47bb-0310-9956-ffa450edef68
parent 7e3a324b

docs/conf/extra/httpd-mpm.conf.in

+16 −4
Original line number Diff line number Diff line 
#

# Server-Pool Size Regulation (MPM specific)

# Server-Pool Management (MPM specific)

# 

# Only one of the below sections will be relevant on your

# installed httpd.  Use "apachectl -l" to find out the

# active mpm.



#

# PidFile: The file in which the server should record its process
@@ -15,6 +12,21 @@ 
    PidFile @rel_runtimedir@/httpd.pid

</IfModule>



#

# The accept serialization lock file MUST BE STORED ON A LOCAL DISK.

#

<IfModule !mpm_winnt_module>

<IfModule !mpm_netware_module>

LockFile @rel_logfiledir@/accept.lock

</IfModule>

</IfModule>



#

# Only one of the below sections will be relevant on your

# installed httpd.  Use "apachectl -l" to find out the

# active mpm.

#



# prefork MPM

# StartServers: number of server processes to start

# MinSpareServers: minimum number of server processes which are kept spare

docs/conf/httpd.conf.in

+4 −8
Original line number Diff line number Diff line
@@ -21,17 +21,13 @@ 
# ServerRoot: The top of the directory tree under which the server's

# configuration, error, and log files are kept.

#

# Do NOT add a slash at the end of the directory path.

# Do NOT add a slash at the end of the directory path.  If you point

# ServerRoot at a non-local disk, be sure to point the LockFile directive

# at a local disk.  If you wish to share the same ServerRoot for multiple

# httpd daemons, you will need to change at least LockFile and PidFile.

#

ServerRoot "@@ServerRoot@@"



# NOTE! The following two directives are used on some systems

# to coordinate the httpd children.  THEY MUST BE STORED ON

# A LOCAL DISK!

#

#LockFile @rel_logfiledir@/accept.lock

#ScoreBoardFile @rel_logfiledir@/apache_runtime_status



#

# Listen: Allows you to bind Apache to specific IP addresses and/or

# ports, instead of the default. See also the <VirtualHost>