gunnar: server/kolabd/kolabd/templates httpd.conf.template.in, 1.16, 1.17
cvs at kolab.org
cvs at kolab.org
Wed Nov 21 12:05:43 CET 2007
Author: gunnar
Update of /kolabrepository/server/kolabd/kolabd/templates
In directory doto:/tmp/cvs-serv17330/kolabd/kolabd/templates
Modified Files:
httpd.conf.template.in
Log Message:
kolab/issue2236
Index: httpd.conf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/httpd.conf.template.in,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- httpd.conf.template.in 18 Oct 2007 04:17:34 -0000 1.16
+++ httpd.conf.template.in 21 Nov 2007 11:05:41 -0000 1.17
@@ -222,6 +222,13 @@
#ForceType application/x-httpd-php
#</Location>
+<AuthnProviderAlias ldap ldap-mail>
+ AuthLDAPURL ldap://@@@ldap_ip@@@:@@@ldap_port@@@/@@@base_dn@@@?mail
+</AuthnProviderAlias>
+<AuthnProviderAlias ldap ldap-uid>
+ AuthLDAPURL ldap://@@@ldap_ip@@@:@@@ldap_port@@@/@@@base_dn@@@?uid
+</AuthnProviderAlias>
+
<Directory "@webserver_document_root@/freebusy">
AllowOverride None
Options None
@@ -239,14 +246,12 @@
AuthType Basic
AuthName "Kolab Freebusy"
- AuthLDAPUrl "@@@ldap_uri@@@/@@@base_dn@@@?mail??"
AuthBasicAuthoritative off
AuthUserFile /dev/null
- AuthBasicProvider ldap
+ AuthBasicProvider ldap-mail ldap-uid
AuthzLDAPAuthoritative off
AuthLDAPBindDN "@@@php_dn@@@"
AuthLDAPBindPassword "@@@php_pw@@@"
- # FIXME: support authenticating with uid, too
@@@endif@@@
AddDefaultCharset Off
</Directory>
@@ -261,19 +266,6 @@
Options None
Order allow,deny
Allow from all
- #AuthName "Kolab Admin Area"
- #AuthType Basic
- #LDAP_Server @@@ldap_ip@@@
- #LDAP_Port @@@ldap_port@@@
- # temporary : openldap changed from 2.1.9 to 2.1.12
- # anonymous bind with dn is nolonger allowed
- # unfortunately mod_auth_ldap seems to exactly do so
- # need to investigate ...
- #Bind_DN "@@@php_dn@@@"
- #Bind_Pass "@@@php_pw@@@"
- #Base_DN "@@@base_dn@@@"
- #UID_Attr uid
- #require valid-user
</Directory>
AddIconByEncoding (CMP,/icons/compressed.gif) x-compress x-gzip
More information about the commits
mailing list