Added a default commented-out mod_ldap and mod_auth_ldap

configuration to httpd-std.conf and httpd-win.conf
PR:
Obtained from:
Submitted by:
Reviewed by:

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

diff --git a/CHANGES b/CHANGES
index 34b965a538baf0339203df18fe10d779e34cc75b..8633e6d4c53554184813448185e4c4a0c12c8f56 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,9 @@
 Changes with Apache 2.0.25-dev
 
+  *) Added a default commented-out mod_ldap and mod_auth_ldap
+     configuration to httpd-std.conf and httpd-win.conf
+     [Graham Leggett]
+
   *) Added documentation for mod_ldap and mod_auth_ldap.
      [Graham Leggett]
 

diff --git a/docs/conf/httpd-std.conf b/docs/conf/httpd-std.conf
index 76f91644bad3b526d32461d9054841094a5d0072..9fd44d952f77e0d4933a5a5eaaa808cb56ef4253 100644 (file)
--- a/docs/conf/httpd-std.conf
+++ b/docs/conf/httpd-std.conf
@@ -175,6 +175,7 @@ MaxRequestsPerChild  0
 #LoadModule auth_db_module modules/mod_auth_db.so
 #LoadModule auth_dbm_module modules/mod_auth_dbm.so
 #LoadModule auth_digest_module modules/mod_auth_digest.so
+#LoadModule auth_ldap_module modules/mod_auth_ldap.so
 #LoadModule cern_meta_module modules/mod_cern_meta.so
 #LoadModule dav_module modules/mod_dav.so
 #LoadModule dav_fs_module modules/mod_dav_fs.so
@@ -182,6 +183,7 @@ MaxRequestsPerChild  0
 #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 mime_magic_module modules/mod_mime_magic.so
 #LoadModule proxy_module modules/mod_proxy.so
 #LoadModule rewrite_module modules/mod_rewrite.so
@@ -846,6 +848,34 @@ BrowserMatch "JDK/1\.0" force-response-1.0
 #    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:

diff --git a/docs/conf/httpd-win.conf b/docs/conf/httpd-win.conf
index c8073129780c0264ceb77258b3e24af47f9a2629..85f80d60d8f15b192f4553cc7dd958c725223338 100644 (file)
--- a/docs/conf/httpd-win.conf
+++ b/docs/conf/httpd-win.conf
@@ -113,6 +113,7 @@ MaxRequestsPerChild  0
 #LoadModule auth_anon_module modules/mod_auth_anon.so
 #LoadModule auth_dbm_module modules/mod_auth_dbm.so
 #LoadModule auth_digest_module modules/mod_auth_digest.so
+#LoadModule auth_ldap_module modules/mod_auth_ldap.so
 #LoadModule cern_meta_module modules/mod_cern_meta.so
 #LoadModule dav_module modules/mod_dav.so
 #LoadModule dav_fs_module modules/mod_dav_fs.so
@@ -120,6 +121,7 @@ MaxRequestsPerChild  0
 #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 proxy_module modules/mod_proxy.so
 #LoadModule rewrite_module modules/mod_rewrite.so
 #LoadModule speling_module modules/mod_speling.so
@@ -765,6 +767,34 @@ BrowserMatch "JDK/1\.0" force-response-1.0
 #    Allow from .@@DomainName@@
 #</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: