[Kolab-devel] [issue2994] Duplicated kolab.conf files in cvs, one should be removed

[Richard Bos]

New submission from Richard Bos <ml at radoeka.nl>:

Due to the investigation for issue1755, I encountered 2 kolab.conf files 
in cvs.  Is this correct?  They are:

kolabd> ls -1  $(find -name "kolab.conf*") | cut -c3-
kolab.conf
templates/kolab.conf.template.in

During bootstrapping kolab.conf is created from 
templates/kolab.conf.template.in.  Hence keeping the regular kolab.conf file
in cvs seems redundant to me.  At the moment they also show some differences:
kolabd> diff -u ./kolab.conf ./templates/kolab.conf.template.in
--- ./kolab.conf        2008-03-04 20:11:52.000000000 +0100
+++ ./templates/kolab.conf.template.in  2007-11-29 09:27:18.000000000 +0100
@@ -4,11 +4,14 @@
 fqdnhostname : @@@fqdnhostname@@@
 is_master : @@@is_master@@@
 base_dn : @@@kolab_basedn@@@
-bind_dn : cn=manager,@@@kolab_basedn@@@
+bind_dn : cn=manager,cn=internal,@@@kolab_basedn@@@
 bind_pw : @@@kolab_passwd@@@
+bind_pw_hash : @@@kolab_passwd_hash@@@
 ldap_uri : ldap://127.0.0.1:389
 ldap_master_uri : @@@ldap_master_uri@@@
-php_dn : cn=nobody,@@@kolab_basedn@@@
+php_dn : cn=nobody,cn=internal,@@@kolab_basedn@@@
 php_pw : @@@nobody_pw@@@
+calendar_id : calendar
+calendar_pw : @@@calendar_pw@@@
 slurpd_addr : 127.0.0.1
 slurpd_port : 9999

It means that calendar_pw, calendar_id and bind_pw_hash are defined in
kolab.conf.template but not in the regular file kolab.conf.  Confusing....

Suggestion: remove kolab.conf from cvs

ps: although the title is: "Duplicated kolab.conf files in cvs, one should be 
removed", I'm not sure that one must be removed, I think so.

----------
messages: 16277
nosy: rbos
priority: minor bug
status: unread
title: Duplicated kolab.conf files in cvs, one should be removed
___________________________________________________
Kolab issue tracker <kolab-issues at intevation.de>
<https://www.intevation.de/roundup/kolab/issue2994>
___________________________________________________