gunnar: server/kolabd/kolabd kolab.globals.in, NONE, 1.1 ChangeLog, 1.103, 1.104 Makefile.am, 1.27, 1.28 kolab.globals, 1.4, NONE

[cvs at kolab.org]

Author: gunnar

Update of /kolabrepository/server/kolabd/kolabd
In directory doto:/tmp/cvs-serv3130/kolabd/kolabd

Modified Files:
	ChangeLog Makefile.am 
Added Files:
	kolab.globals.in 
Removed Files:
	kolab.globals 
Log Message:
Replaced path reference to the kolabconf script by a configuration variable.

--- NEW FILE: kolab.globals.in ---
conn_refresh_period : 60
cyrus-admins : manager
cyrus-autocreatequota : 100000
cyrus-imap : TRUE
cyrus-imaps : TRUE
cyrus-pop3 : FALSE
cyrus-pop3s : TRUE
cyrus-sieve : TRUE
directory_mode : slurpd
gyard_deletion_period : 10080
ldap_uri : ldap://127.0.0.1:389
log_level : 2
debug : 0
postfix-mydestination : $mydomain
proftpd-ftp : FALSE
proftpd-userPassword :
sf_field_deleted : kolabdeleteflag
sf_field_guid : entryUUID
sf_field_modified : modifytimestamp
sf_field_quota : cyrus-userquota
sf_object_class : kolabsharedfolder
slurpd_addr : 127.0.0.1
slurpd_accept_addr : 127.0.0.1
slurpd_port : 9999
uid : freebusy
userPassword : freebusy
user_field_deleted : kolabdeleteflag
user_field_guid : entryUUID
user_field_modified : modifytimestamp
user_field_quota : cyrus-userquota
user_object_class : inetOrgPerson
maildefer_size: 
maildefer_header: 
maildefer_listen: 127.0.0.1:10024
maildefer_talk: 127.0.0.1:10025
kolabconf_script: @kolabconf_script@

Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -d -r1.103 -r1.104
--- ChangeLog	26 Jul 2007 15:04:50 -0000	1.103
+++ ChangeLog	27 Jul 2007 18:25:20 -0000	1.104
@@ -1,3 +1,14 @@
+2007-07-27  Gunnar Wrobel  <p at rdus.de>
+
+	* kolab.globals.in:
+	* dist_conf/*:
+
+	Added the kolabconf_script variable.
+
+	* Makefile.am (kolab.globals):
+
+	Made kolab.globals a rewritten file (kolab.globals.in)
+
 2007-07-26  Gunnar Wrobel  <p at rdus.de>
 
 	* Makefile.am:

Index: Makefile.am
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/Makefile.am,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- Makefile.am	26 Jul 2007 15:04:50 -0000	1.27
+++ Makefile.am	27 Jul 2007 18:25:20 -0000	1.28
@@ -179,6 +179,12 @@
 CLEANFILES += kolab
 EXTRA_DIST += kolab.in
 
+kolab.globals: kolab.globals.in
+	@$(mkinstalldirs) .
+	$(do_subst) <$(srcdir)/kolab.globals.in >$@
+CLEANFILES += kolab.globals
+EXTRA_DIST += kolab.globals.in
+
 kolab_ca.sh: kolab_ca.sh.in
 	@$(mkinstalldirs) .
 	 $(do_subst) <$(srcdir)/kolab_ca.sh.in >$@

--- kolab.globals DELETED ---