steffen: server/kolab/kolab main.cf.template, 1.9, 1.10 php.ini.template, 1.3, 1.4

[cvs at intevation.de]

Author: steffen

Update of /kolabrepository/server/kolab/kolab
In directory doto:/tmp/cvs-serv30725/kolab

Modified Files:
	main.cf.template php.ini.template 
Log Message:
ldap map for distribution lists, removed old admin interface from build, added new php include-dir

Index: main.cf.template
===================================================================
RCS file: /kolabrepository/server/kolab/kolab/main.cf.template,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- main.cf.template	16 Apr 2004 11:58:35 -0000	1.9
+++ main.cf.template	18 May 2004 01:52:39 -0000	1.10
@@ -40,7 +40,7 @@
 
 #   maps
 canonical_maps = hash:@l_prefix@/etc/postfix/canonical
-virtual_maps = ldap:ldapsource
+virtual_maps = ldap:ldapdistlist, ldap:ldapvirtual
 # virtual_maps = hash:@l_prefix@/etc/postfix/virtual
 relocated_maps = hash:@l_prefix@/etc/postfix/relocated
 transport_maps = hash:@l_prefix@/etc/postfix/transport
@@ -111,14 +111,28 @@
 # LDAP Alias support
 #
 
-ldapsource_search_base = @@@user_dn_list@@@
-ldapsource_query_filter = (alias=%s)
-ldapsource_result_attribute = mail
-ldapsource_result_filter = %s
-ldapsource_search_timeout = 2
-ldapsource_scope = one
-ldapsource_bind = no
-ldapsource_version = 3
+ldapvirtual_search_base = @@@user_dn_list@@@
+ldapvirtual_query_filter = (alias=%s)
+ldapvirtual_result_attribute = mail
+ldapvirtual_result_filter = %s
+ldapvirtual_search_timeout = 2
+ldapvirtual_scope = one
+ldapvirtual_bind = no
+ldapvirtual_version = 3
+
+#
+# LDAP Distributionlist support
+#
+
+ldapdistlist_search_base = @@@user_dn_list@@@
+ldapdistlist_query_filter = (cn=%u)
+ldapdistlist_special_result_attribute = member
+ldapdistlist_result_attribute = mail
+ldapdistlist_result_filter = %s
+ldapdistlist_search_timeout = 2
+ldapdistlist_scope = one
+ldapdistlist_bind = no
+ldapdistlist_version = 3
 
 @@@if postfix-enable-virus-scan@@@
 #

Index: php.ini.template
===================================================================
RCS file: /kolabrepository/server/kolab/kolab/php.ini.template,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- php.ini.template	22 May 2003 18:49:51 -0000	1.3
+++ php.ini.template	18 May 2004 01:52:39 -0000	1.4
@@ -365,6 +365,7 @@
 ;
 ; Windows: "\path1;\path2"
 ;include_path = ".;c:\php\includes"
+include_path = ".:/php/include:@l_prefix@/lib/php:@l_prefix@/var/kolab/php"
 
 ; The root of the PHP pages, used only if nonempty.
 ; if PHP was not compiled with FORCE_REDIRECT, you SHOULD set doc_root