Commit 55662579 authored by William A. Rowe Jr's avatar William A. Rowe Jr
Browse files 

  Split the significant modules into segregated module configs.

  Probably should do the same with negotation/autoindex, since those
  are _so_ huge, but not this afternoon on my schedule.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91295 13f79535-47bb-0310-9956-ffa450edef68
parent bc67378a

docs/conf/httpd-std.conf

+16 −59
Original line number Diff line number Diff line
@@ -49,11 +49,12 @@ 
#

ServerRoot "@@ServerRoot@@"



<IfModule !mpm_winnt.c>

#

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

#

<IfModule !mpm_winnt.c>

#LockFile logs/accept.lock

</IfModule>



#

# ScoreBoardFile: File used to store internal server process information.
@@ -61,12 +62,13 @@ ServerRoot "@@ServerRoot@@" 
# this file will be  created when you run Apache) then you *must* ensure that

# no two invocations of Apache share the same scoreboard file.

#

<IfModule !mpm_winnt.c>

<IfModule !perchild.c>

ScoreBoardFile logs/apache_runtime_status

</IfModule>



</IfModule>





#

# PidFile: The file in which the server should record its process

# identification number when it starts.
@@ -202,6 +204,8 @@ Listen @@Port@@ 
#LoadModule file_cache_module modules/mod_file_cache.so

#LoadModule headers_module modules/mod_headers.so

#LoadModule info_module modules/mod_info.so

#LoadModule ldap_module modules/mod_ldap.so

#LoadModule auth_ldap_module modules/mod_auth_ldap.so

#LoadModule mime_magic_module modules/mod_mime_magic.so

#LoadModule proxy_module modules/mod_proxy.so

#LoadModule proxy_connect_module modules/proxy_connect.so
@@ -944,67 +948,20 @@ BrowserMatch "JDK/1\.0" force-response-1.0 
#</Location>



#

# Enable the LDAP connection pool and shared memory cache. Enable the

# LDAP cache status handler. Requires that mod_ldap be loaded. Change

# the ".your_domain.com" to match your domain to enable.

#

#<IfModule util_ldap.c>

# Bring in additional module-specific configurations

#

#    LDAPSharedCacheSize 200000

#    LDAPCacheEntries 1024

#    LDAPCacheTTL 600

#    LDAPOpCacheEntries 1024

#    LDAPOpCacheTTL 600

#

#    <Location /ldap-status>

#        SetHandler ldap-status

#        Order deny,allow

#        Deny from all

#        Allow from .your_domain.com

#        <IfModule mod_auth_ldap.c>

#            AuthLDAPEnabled on

#            AuthLDAPURL ldap://127.0.0.1/dc=example,dc=com?uid?one

#            AuthLDAPAuthoritative on

#            require valid-user

#        </IfModule>

#    </Location>

#

#</IfModule>



#

# Proxy Server directives. Uncomment the following lines to

# enable the proxy server:

#

#<IfModule mod_proxy.c>

#ProxyRequests On

#

#<Proxy *>

#    Order deny,allow

#    Deny from all

#    Allow from .your_domain.com

#</Proxy>

<IfModule mod_ssl.c>

    Include ssl.conf

</IfModule>



#

# Enable/disable the handling of HTTP/1.1 "Via:" headers.

# ("Full" adds the server version; "Block" removes all outgoing Via: headers)

# Set to one of: Off | On | Full | Block

#

#ProxyVia On

<IfModule mod_proxy.c>

    Include proxy.conf

</IfModule>



#

# To enable the cache as well, edit and uncomment the following lines:

# (no cacheing without CacheRoot)

#

#CacheRoot "@@ServerRoot@@/proxy"

#CacheSize 5

#CacheGcInterval 4

#CacheMaxExpire 24

#CacheLastModifiedFactor 0.1

#CacheDefaultExpire 1

#NoCache a_domain.com another_domain.edu joes.garage_sale.com

<IfModule mod_ldap.c>

    Include ldap.conf

</IfModule>



#</IfModule>

# End of proxy directives.



### Section 3: Virtual Hosts

#

docs/conf/httpd-win.conf

+7 −58
Original line number Diff line number Diff line
@@ -848,67 +848,16 @@ BrowserMatch "JDK/1\.0" force-response-1.0 
#</Location>



#

# Enable the LDAP connection pool and shared memory cache. Enable the

# LDAP cache status handler. Requires that mod_ldap be loaded. Change

# the ".your_domain.com" to match your domain to enable.

# Bring in additional module-specific configurations

#

#<IfModule util_ldap.c>

#

#    LDAPSharedCacheSize 200000

#    LDAPCacheEntries 1024

#    LDAPCacheTTL 600

#    LDAPOpCacheEntries 1024

#    LDAPOpCacheTTL 600

#

#    <Location /ldap-status>

#        SetHandler ldap-status

#        Order deny,allow

#        Deny from all

#        Allow from .your_domain.com

#        <IfModule mod_auth_ldap.c>

#            AuthLDAPEnabled on

#            AuthLDAPURL ldap://127.0.0.1/dc=example,dc=com?uid?one

#            AuthLDAPAuthoritative on

#            require valid-user

#        </IfModule>

#    </Location>

#

#</IfModule>



#

# Proxy Server directives. Uncomment the following lines to

# enable the proxy server:

#

#<IfModule mod_proxy.c>

#ProxyRequests On

#

#<Proxy *>

#    Order deny,allow

#    Deny from all

#    Allow from .your_domain.com

#</Proxy>



#

# Enable/disable the handling of HTTP/1.1 "Via:" headers.

# ("Full" adds the server version; "Block" removes all outgoing Via: headers)

# Set to one of: Off | On | Full | Block

#

#ProxyVia On

<IfModule mod_ssl.c>

    Include ssl.conf

</IfModule>



#

# To enable the cache as well, edit and uncomment the following lines:

# (no cacheing without CacheRoot)

#

#CacheRoot "@@ServerRoot@@/proxy"

#CacheSize 5

#CacheGcInterval 4

#CacheMaxExpire 24

#CacheLastModifiedFactor 0.1

#CacheDefaultExpire 1

#NoCache a_domain.com another_domain.edu joes.garage_sale.com

<IfModule mod_proxy.c>

    Include proxy.conf

</IfModule>



#</IfModule>

# End of proxy directives.



### Section 3: Virtual Hosts

#

docs/conf/ldap-std.conf

0 → 100644
+28 −0
Original line number Diff line number Diff line 
#

# Enable the LDAP connection pool and shared memory cache. Enable the

# LDAP cache status handler. Requires that mod_ldap be loaded. Change

# the ".your_domain.com" to match your domain to enable.

#

#<IfModule util_ldap.c>

#

#    LDAPSharedCacheSize 200000

#    LDAPCacheEntries 1024

#    LDAPCacheTTL 600

#    LDAPOpCacheEntries 1024

#    LDAPOpCacheTTL 600

#

#    <Location /ldap-status>

#        SetHandler ldap-status

#        Order deny,allow

#        Deny from all

#        Allow from .your_domain.com

#        <IfModule mod_auth_ldap.c>

#            AuthLDAPEnabled on

#            AuthLDAPURL ldap://127.0.0.1/dc=example,dc=com?uid?one

#            AuthLDAPAuthoritative on

#            require valid-user

#        </IfModule>

#    </Location>

#

#</IfModule>

docs/conf/ldap.conf

0 → 100644
+28 −0
Original line number Diff line number Diff line 
#

# Enable the LDAP connection pool and shared memory cache. Enable the

# LDAP cache status handler. Requires that mod_ldap be loaded. Change

# the ".your_domain.com" to match your domain to enable.

#

#<IfModule util_ldap.c>

#

#    LDAPSharedCacheSize 200000

#    LDAPCacheEntries 1024

#    LDAPCacheTTL 600

#    LDAPOpCacheEntries 1024

#    LDAPOpCacheTTL 600

#

#    <Location /ldap-status>

#        SetHandler ldap-status

#        Order deny,allow

#        Deny from all

#        Allow from .your_domain.com

#        <IfModule mod_auth_ldap.c>

#            AuthLDAPEnabled on

#            AuthLDAPURL ldap://127.0.0.1/dc=example,dc=com?uid?one

#            AuthLDAPAuthoritative on

#            require valid-user

#        </IfModule>

#    </Location>

#

#</IfModule>

docs/conf/proxy-std.conf

0 → 100644
+35 −0
Original line number Diff line number Diff line 
#

# Proxy Server directives. Uncomment the following lines to

# enable the proxy server:

#

#<IfModule mod_proxy.c>

#ProxyRequests On

#

#<Proxy *>

#    Order deny,allow

#    Deny from all

#    Allow from .your_domain.com

#</Proxy>



#

# Enable/disable the handling of HTTP/1.1 "Via:" headers.

# ("Full" adds the server version; "Block" removes all outgoing Via: headers)

# Set to one of: Off | On | Full | Block

#

#ProxyVia On



#

# To enable the cache as well, edit and uncomment the following lines:

# (no cacheing without CacheRoot)

#

#CacheRoot "@@ServerRoot@@/proxy"

#CacheSize 5

#CacheGcInterval 4

#CacheMaxExpire 24

#CacheLastModifiedFactor 0.1

#CacheDefaultExpire 1

#NoCache a_domain.com another_domain.edu joes.garage_sale.com



#</IfModule>

# End of proxy directives.