mathieu: server/perl-kolab/sbin kolab_bootstrap.in,1.12,1.13

[cvs at kolab.org]

Author: mathieu

Update of /kolabrepository/server/perl-kolab/sbin
In directory doto:/tmp/cvs-serv29641/perl-kolab/sbin

Modified Files:
	kolab_bootstrap.in 
Log Message:
    Added arguments to rebuildTemplates(): dorunonchange and templates.
    Use those in kolab_bootstrap (in replacement of bootstrapConfig()).




Index: kolab_bootstrap.in
===================================================================
RCS file: /kolabrepository/server/perl-kolab/sbin/kolab_bootstrap.in,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- kolab_bootstrap.in	23 Nov 2009 22:47:05 -0000	1.12
+++ kolab_bootstrap.in	13 Dec 2009 19:48:26 -0000	1.13
@@ -470,7 +470,15 @@
       # hence can't be used, these definitons are skipped when
       # bootstrap_config = true
       $Kolab::config{"bootstrap_config"} = 'true';
-      Kolab::Conf::bootstrapConfig();
+      my $templatedir = $Kolab::config{"templatedir"};
+      Kolab::Conf::rebuildTemplates(
+            dorunonchange =>0,
+            templates => [
+              "$templatedir/slapd.access.template.in",
+              "$templatedir/slapd.conf.template.in",
+              "$templatedir/slapd.replicas.template.in"
+            ],
+        );
       $Kolab::config{"bootstrap_config"} = 'false';
 
       # now we must startup slapd