gunnar: server/kolabd/kolabd/templates httpd.conf.template.in, 1.10, 1.11 imapd.annotation_definitions.template.in, 1.2, 1.3 imapd.conf.template.in, 1.13, 1.14 main.cf.template.in, 1.16, 1.17
cvs at kolab.org
cvs at kolab.org
Wed Oct 3 12:05:20 CEST 2007
- Previous message: gunnar: server/horde/horde-turba HK-GW-Changes_after_ALPHA.patch, NONE, 1.1 HK-GW-Fix_address_book_deletion_1.patch, NONE, 1.1 HK-GW-Fix_editing_contacts.patch, NONE, 1.1 HK-GW-Fix_notice_on_addressbook_creation.patch, NONE, 1.1 HK-GW-Fix_share_id_change.patch, NONE, 1.1 HK-GW-Ldap_read_only_fix.patch, NONE, 1.1 horde-turba-kolab.spec, 1.15, 1.16 sources.php, 1.2, 1.3
- Next message: gunnar: server release-notes.txt,1.151,1.152
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: gunnar
Update of /kolabrepository/server/kolabd/kolabd/templates
In directory doto:/tmp/cvs-serv4379/kolabd/kolabd/templates
Modified Files:
httpd.conf.template.in
imapd.annotation_definitions.template.in
imapd.conf.template.in main.cf.template.in
Log Message:
Bug fixes for the Beta release.
Index: httpd.conf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/httpd.conf.template.in,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- httpd.conf.template.in 2 Aug 2007 10:34:38 -0000 1.10
+++ httpd.conf.template.in 3 Oct 2007 10:05:18 -0000 1.11
@@ -416,3 +416,4 @@
# used for local non Kolab extension
Include @webserver_confdir@/apache2.local
+Include @webserver_confdir@/*.conf
\ No newline at end of file
Index: imapd.annotation_definitions.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/imapd.annotation_definitions.template.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- imapd.annotation_definitions.template.in 12 Sep 2007 13:18:10 -0000 1.2
+++ imapd.annotation_definitions.template.in 3 Oct 2007 10:05:18 -0000 1.3
@@ -7,4 +7,5 @@
/vendor/kolab/folder-type,mailbox,string,backend,value.shared value.priv,a
/vendor/kolab/incidences-for,mailbox,string,backend,value.shared value.priv,a
/vendor/kolab/h-share-attr-desc,mailbox,string,backend,value.shared value.priv,a
+/vendor/horde/share-params,mailbox,string,backend,value.shared value.priv,a
/vendor/x-toltec/test,mailbox,string,backend,value.shared value.priv,a
Index: imapd.conf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/imapd.conf.template.in,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- imapd.conf.template.in 31 Aug 2007 10:38:54 -0000 1.13
+++ imapd.conf.template.in 3 Oct 2007 10:05:18 -0000 1.14
@@ -79,6 +79,9 @@
sievenotifier: mailto
mailnotifier: mailto
+# the sieve extensions that should be enabled on the server
+sieve_extensions: fileinto reject vacation imapflags notify include envelope body relational regex subaddress copy
+
# use berkeley db backend instead of skiplist
annotation_db: berkeley
mboxlist_db: berkeley
Index: main.cf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/main.cf.template.in,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- main.cf.template.in 9 May 2007 10:16:24 -0000 1.16
+++ main.cf.template.in 3 Oct 2007 10:05:18 -0000 1.17
@@ -69,15 +69,15 @@
# maps
canonical_maps = hash:@emailserver_confdir@/canonical
-virtual_maps = hash:@emailserver_confdir@/virtual,
+virtual_alias_maps = hash:@emailserver_confdir@/virtual,
ldap:@emailserver_confdir@/ldapdistlist.cf,
ldap:@emailserver_confdir@/ldapvirtual.cf
relocated_maps = hash:@emailserver_confdir@/relocated
transport_maps = hash:@emailserver_confdir@/transport, ldap:@emailserver_confdir@/ldaptransport.cf
alias_maps = hash:@aliases_file@
alias_database = hash:@aliases_file@
-#virtual_mailbox_maps = $virtual_maps
-local_recipient_maps = $virtual_maps, $alias_maps
+#virtual_mailbox_maps = $virtual_alias_maps
+local_recipient_maps = $virtual_alias_maps, $alias_maps
# Don't parse and modify headers of message/rfc822 attachments
disable_mime_input_processing = yes
- Previous message: gunnar: server/horde/horde-turba HK-GW-Changes_after_ALPHA.patch, NONE, 1.1 HK-GW-Fix_address_book_deletion_1.patch, NONE, 1.1 HK-GW-Fix_editing_contacts.patch, NONE, 1.1 HK-GW-Fix_notice_on_addressbook_creation.patch, NONE, 1.1 HK-GW-Fix_share_id_change.patch, NONE, 1.1 HK-GW-Ldap_read_only_fix.patch, NONE, 1.1 horde-turba-kolab.spec, 1.15, 1.16 sources.php, 1.2, 1.3
- Next message: gunnar: server release-notes.txt,1.151,1.152
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the commits
mailing list