httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject cvs commit: httpd-2.0/docs/conf ldap.conf proxy.conf ssl.conf httpd-std.conf httpd-win.conf
Date Thu, 04 Oct 2001 20:40:38 GMT
wrowe       01/10/04 13:40:38

  Modified:    docs/conf httpd-std.conf httpd-win.conf
  Added:       docs/conf ldap.conf proxy.conf ssl.conf
  Log:
    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.
  
  Revision  Changes    Path
  1.55      +16 -59    httpd-2.0/docs/conf/httpd-std.conf
  
  Index: httpd-std.conf
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/docs/conf/httpd-std.conf,v
  retrieving revision 1.54
  retrieving revision 1.55
  diff -u -r1.54 -r1.55
  --- httpd-std.conf	2001/10/04 20:28:34	1.54
  +++ httpd-std.conf	2001/10/04 20:40:37	1.55
  @@ -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 @@
   # 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 @@
   #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
  @@ -943,68 +947,21 @@
   #    Allow from .your_domain.com
   #</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>
  -#
  -#    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:
  +# Bring in additional module-specific configurations
   #
  -#<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
   #
  
  
  
  1.43      +7 -58     httpd-2.0/docs/conf/httpd-win.conf
  
  Index: httpd-win.conf
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/docs/conf/httpd-win.conf,v
  retrieving revision 1.42
  retrieving revision 1.43
  diff -u -r1.42 -r1.43
  --- httpd-win.conf	2001/10/04 20:28:34	1.42
  +++ httpd-win.conf	2001/10/04 20:40:37	1.43
  @@ -848,67 +848,16 @@
   #</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
   #
  
  
  
  1.1                  httpd-2.0/docs/conf/ldap.conf
  
  Index: ldap.conf
  ===================================================================
  #
  # 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>
  
  
  
  
  1.1                  httpd-2.0/docs/conf/proxy.conf
  
  Index: proxy.conf
  ===================================================================
  #
  # 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.
  
  
  
  
  1.1                  httpd-2.0/docs/conf/ssl.conf
  
  	<<Binary file>>
  
  

Mime
View raw message