thomas: server/kolabd/kolabd kolab.conf, 1.1.1.1, 1.1.1.1.4.1 kolab_bootstrap.in, 1.26, 1.26.2.1

cvs at kolab.org cvs at kolab.org
Thu Sep 27 17:54:41 CEST 2007


Author: thomas

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

Modified Files:
      Tag: kolab_2_1_branch
	kolab.conf kolab_bootstrap.in 
Log Message:
Fix bootstrap for @@@slurpd_addr@@@ and @@@slurpd_port@@@ in slapd.conf.template


Index: kolab.conf
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/kolab.conf,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.4.1
diff -u -d -r1.1.1.1 -r1.1.1.1.4.1
--- kolab.conf	23 Nov 2004 20:26:47 -0000	1.1.1.1
+++ kolab.conf	27 Sep 2007 15:54:38 -0000	1.1.1.1.4.1
@@ -10,3 +10,5 @@
 ldap_master_uri : @@@ldap_master_uri@@@
 php_dn : cn=nobody,@@@kolab_basedn@@@
 php_pw : @@@nobody_pw@@@
+slurpd_addr : 127.0.0.1
+slurpd_port : 9999

Index: kolab_bootstrap.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/kolab_bootstrap.in,v
retrieving revision 1.26
retrieving revision 1.26.2.1
diff -u -d -r1.26 -r1.26.2.1
--- kolab_bootstrap.in	25 May 2007 10:16:06 -0000	1.26
+++ kolab_bootstrap.in	27 Sep 2007 15:54:38 -0000	1.26.2.1
@@ -272,6 +272,8 @@
 my $php_pw = $kolab_config{'php_pw'} || die "could not read php_pw from $kolab_config";
 my $calendar_dn = $kolab_config{'calendar_dn'};
 my $calendar_pw = $kolab_config{'calendar_pw'};
+my $slurpd_addr = $kolab_config{'slurpd_addr'} || die "could not read slurpd_addr from $kolab_config";
+my $slurpd_port = $kolab_config{'slurpd_port'} || die "could not read slurpd_port from $kolab_config";
 my @kolabhosts;
 
 if (!$bind_dn || !$bind_pw || !$ldap_uri || !$base_dn) {
@@ -373,6 +375,8 @@
     print $fd "php_pw : $php_pw\n";
     print $fd "calendar_dn : $calendar_dn\n";
     print $fd "calendar_pw : $calendar_pw\n";
+    print $fd "slurpd_addr : $slurpd_addr\n";
+    print $fd "slurpd_port : $slurpd_port\n";
     undef $fd;
     print "done modifying $kolab_config\n\n";
     chmod 0600, $kolab_config;
@@ -431,6 +435,8 @@
         s/\@\@\@base_dn\@\@\@/$base_dn/g;
         s/\@\@\@bind_dn\@\@\@/$bind_dn/g;
         s/\@\@\@bind_pw_hash\@\@\@/$bind_pw/g;
+        s/\@\@\@slurpd_addr\@\@\@/$slurpd_addr/g;
+        s/\@\@\@slurpd_port\@\@\@/$slurpd_port/g;
         s/TLSCertificate/\#TLSCertificate/g;
         print $slpd $_;
       }
@@ -829,6 +835,8 @@
   print $fd "php_pw : $php_pw\n";
   print $fd "calendar_dn : $calendar_dn\n";
   print $fd "calendar_pw : $calendar_pw\n";
+  print $fd "slurpd_addr : $slurpd_addr\n";
+  print $fd "slurpd_port : $slurpd_port\n";
   undef $fd;
   print "done modifying $kolab_config\n\n";
   chmod 0600, $kolab_config;
@@ -932,6 +940,8 @@
   print $fd "php_pw : $php_pw\n";
   print $fd "calendar_dn : $calendar_dn\n";
   print $fd "calendar_pw : $calendar_pw\n";
+  print $fd "slurpd_addr : $slurpd_addr\n";
+  print $fd "slurpd_port : $slurpd_port\n";
   undef $fd;
   print "done modifying $kolab_config\n\n";
   chmod 0600, $kolab_config;





More information about the commits mailing list