richard: server/kolabd/kolabd ChangeLog, 1.186, 1.187 kolab_bootstrap.in, 1.40, 1.41
cvs at kolab.org
cvs at kolab.org
Wed Aug 27 22:53:56 CEST 2008
Author: richard
Update of /kolabrepository/server/kolabd/kolabd
In directory doto:/tmp/cvs-serv17968
Modified Files:
ChangeLog kolab_bootstrap.in
Log Message:
read the config file kolab.conf with a function from Kolab::Conf
Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v
retrieving revision 1.186
retrieving revision 1.187
diff -u -d -r1.186 -r1.187
--- ChangeLog 27 Aug 2008 20:04:06 -0000 1.186
+++ ChangeLog 27 Aug 2008 20:53:53 -0000 1.187
@@ -2,6 +2,8 @@
* templates/slapd.conf.template.in: added @@@if conditional aroud
the TLSCertificate variable assignments. See kolab/issue3005
+ * kolab_bootstrap.in: read the config file kolab.conf with a function
+ from Kolab::Conf
2008-08-26 Richard Bos <richard at radoeka.nl>
Index: kolab_bootstrap.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/kolab_bootstrap.in,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -d -r1.40 -r1.41
--- kolab_bootstrap.in 20 Aug 2008 20:15:40 -0000 1.40
+++ kolab_bootstrap.in 27 Aug 2008 20:53:53 -0000 1.41
@@ -232,14 +232,8 @@
# fetch fresh template
copy("@sysconfdir@/kolab/templates/kolab.conf.template", $kolab_config);
-my $fd = IO::File->new($kolab_config, "r")
- || die "could not open $kolab_config";
-foreach (<$fd>) {
- if (/(.*) : (.*)/) {
- $kolab_config{$1} = $2;
- }
-}
-undef $fd;
+%kolab_config = Kolab::readConfig(\%kolab_config, $kolab_config);
+
my $fqdnhostname = $kolab_config{'fqdnhostname'} || die "could not read fqdnhostname from $kolab_config";
my $is_master = $kolab_config{'is_master'} || "true";
my $bind_dn = $kolab_config{'bind_dn'} || die "could not read bind_dn from $kolab_config";
@@ -339,7 +333,7 @@
chomp $calendar_pw;
}
- $fd = IO::File->new($kolab_config, "w+") || die "could not open $kolab_config";
+ my $fd = IO::File->new($kolab_config, "w+") || die "could not open $kolab_config";
print $fd "fqdnhostname : $fqdn\n";
print $fd "is_master : $is_master\n";
print $fd "base_dn : $base_dn\n";
@@ -727,7 +721,7 @@
(print "Error reading nobody password" && goto SLAVESTART) unless( $php_pw );
(print "Error reading calendar password" && goto SLAVESTART) unless( $calendar_pw );
- $fd = IO::File->new($kolab_config, "w+") || die "could not open $kolab_config";
+ my $fd = IO::File->new($kolab_config, "w+") || die "could not open $kolab_config";
print $fd "fqdnhostname : $fqdn\n";
print $fd "is_master : $is_master\n";
print $fd "base_dn : $base_dn\n";
More information about the commits
mailing list