[csw-devel] SF.net SVN: gar:[11128] csw/mgar/pkg/apache2/trunk

[bdwalton at users.sourceforge.net]

Revision: 11128
          http://gar.svn.sourceforge.net/gar/?rev=11128&view=rev
Author:   bdwalton
Date:     2010-10-02 13:01:08 +0000 (Sat, 02 Oct 2010)

Log Message:
-----------
apache2: no need for a special template mpm file now

Modified Paths:
--------------
    csw/mgar/pkg/apache2/trunk/Makefile

Removed Paths:
-------------
    csw/mgar/pkg/apache2/trunk/files/httpd-mpm.conf.CSW

Modified: csw/mgar/pkg/apache2/trunk/Makefile
===================================================================
--- csw/mgar/pkg/apache2/trunk/Makefile	2010-10-02 02:26:31 UTC (rev 11127)
+++ csw/mgar/pkg/apache2/trunk/Makefile	2010-10-02 13:01:08 UTC (rev 11128)
@@ -40,7 +40,6 @@
 DISTFILES += CSWapache2.preinstall CSWapache2.postinstall
 
 # Configuration templates
-DISTFILES += httpd-mpm.conf.CSW
 DISTFILES += httpd-ssl.conf.CSW
 DISTFILES += update20to22
 DISTFILES += README.CSW.apache2 README.CSW.ap2_prefork
@@ -219,7 +218,6 @@
 copy-local-files:
 	@ginstall -d $(DESTDIR)/etc/opt/csw/init.d
 	@ginstall $(WORKDIR)/cswapache2 $(DESTDIR)/etc/opt/csw/init.d
-	@ginstall -m0644 $(WORKDIR)/httpd-mpm.conf.CSW $(APACHE_ROOT)/etc/extra
 	@ginstall -m0644 $(WORKDIR)/httpd-ssl.conf.CSW $(APACHE_ROOT)/etc/extra
 	@ginstall $(WORKDIR)/update20to22 $(APACHE_ROOT)/sbin
 	@$(MAKECOOKIE)
@@ -234,6 +232,7 @@
 template_list += etc/extra/httpd-multilang-errordoc.conf
 template_list += etc/extra/httpd-userdir.conf
 template_list += etc/extra/httpd-vhosts.conf
+template_list += etc/extra/httpd-mpm.conf
 template_list += etc/magic
 template_list += etc/mime.types
 

Deleted: csw/mgar/pkg/apache2/trunk/files/httpd-mpm.conf.CSW
===================================================================
--- csw/mgar/pkg/apache2/trunk/files/httpd-mpm.conf.CSW	2010-10-02 02:26:31 UTC (rev 11127)
+++ csw/mgar/pkg/apache2/trunk/files/httpd-mpm.conf.CSW	2010-10-02 13:01:08 UTC (rev 11128)
@@ -1,101 +0,0 @@
-#
-# Server-Pool Management (MPM specific)
-# 
-
-#
-# PidFile: The file in which the server should record its process
-# identification number when it starts.
-#
-# Note that this is the default PidFile for most MPMs.
-#
-<IfModule !mpm_netware_module>
-    PidFile var/run/httpd.pid
-</IfModule>
-
-#
-# The accept serialization lock file MUST BE STORED ON A LOCAL DISK.
-#
-<IfModule !mpm_winnt_module>
-<IfModule !mpm_netware_module>
-LockFile var/log/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
-# MaxSpareServers: maximum number of server processes which are kept spare
-# MaxClients: maximum number of server processes allowed to start
-# MaxRequestsPerChild: maximum number of requests a server process serves
-<IfModule mpm_prefork_module>
-    StartServers          5
-    MinSpareServers       5
-    MaxSpareServers      10
-    MaxClients          150
-    MaxRequestsPerChild   0
-</IfModule>
-
-# worker MPM
-# StartServers: initial number of server processes to start
-# MaxClients: maximum number of simultaneous client connections
-# MinSpareThreads: minimum number of worker threads which are kept spare
-# MaxSpareThreads: maximum number of worker threads which are kept spare
-# ThreadsPerChild: constant number of worker threads in each server process
-# MaxRequestsPerChild: maximum number of requests a server process serves
-<IfModule mpm_worker_module>
-    StartServers          2
-    MaxClients          150
-    MinSpareThreads      25
-    MaxSpareThreads      75 
-    ThreadsPerChild      25
-    MaxRequestsPerChild   0
-</IfModule>
-
-# BeOS MPM
-# StartThreads: how many threads do we initially spawn?
-# MaxClients:   max number of threads we can have (1 thread == 1 client)
-# MaxRequestsPerThread: maximum number of requests each thread will process
-<IfModule mpm_beos_module>
-    StartThreads            10
-    MaxClients              50
-    MaxRequestsPerThread 10000
-</IfModule>
-
-# NetWare MPM
-# ThreadStackSize: Stack size allocated for each worker thread
-# StartThreads: Number of worker threads launched at server startup
-# MinSpareThreads: Minimum number of idle threads, to handle request spikes
-# MaxSpareThreads: Maximum number of idle threads
-# MaxThreads: Maximum number of worker threads alive at the same time
-# MaxRequestsPerChild: Maximum  number of requests a thread serves. It is 
-#                      recommended that the default value of 0 be set for this
-#                      directive on NetWare.  This will allow the thread to 
-#                      continue to service requests indefinitely.                          
-<IfModule mpm_netware_module>
-    ThreadStackSize      65536
-    StartThreads           250
-    MinSpareThreads         25
-    MaxSpareThreads        250
-    MaxThreads            1000
-    MaxRequestsPerChild      0
-    MaxMemFree             100
-</IfModule>
-
-# OS/2 MPM
-# StartServers: Number of server processes to maintain
-# MinSpareThreads: Minimum number of idle threads per process, 
-#                  to handle request spikes
-# MaxSpareThreads: Maximum number of idle threads per process
-# MaxRequestsPerChild: Maximum number of connections per server process
-<IfModule mpm_mpmt_os2_module>
-    StartServers           2
-    MinSpareThreads        5
-    MaxSpareThreads       10
-    MaxRequestsPerChild    0
-</IfModule>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.