richard: server/perl-kolab/sbin kolab_bootstrap.in,1.8,1.9

[cvs at kolab.org]

Author: richard

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

Modified Files:
	kolab_bootstrap.in 
Log Message:
Change $Kolab::config{'LDAPD'} to just openldap, see kolab/issue3604
kolabsrv (kolabd dist_conf/kolabsrv.in) will take care for the
conversion, from an openpkg service name to the correct service name
for other distributions



Index: kolab_bootstrap.in
===================================================================
RCS file: /kolabrepository/server/perl-kolab/sbin/kolab_bootstrap.in,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- kolab_bootstrap.in	27 Mar 2009 11:45:29 -0000	1.8
+++ kolab_bootstrap.in	7 May 2009 18:42:37 -0000	1.9
@@ -612,7 +612,7 @@
 
    if ($ldap_uri =~ /127\.0\.0\.1/ || $ldap_uri =~ /localhost/) {
       print "\nkill temporary slapd\n\n";
-      system("$Kolab::config{'KOLABRC'} rc $Kolab::config{'LDAPD'} stop");
+      system("$Kolab::config{'KOLABRC'} rc openldap stop");
       sleep 1; # actually race should be impossible
       system("killall -9 slapd >/dev/null 2>&1");
    }
@@ -665,7 +665,7 @@
   ##### Slave server setup
 
   print "stop running slapd (if any)\n";
-  kolab_system("$Kolab::config{'KOLABRC'} rc $Kolab::config{'LDAPD'} stop");
+  kolab_system("$Kolab::config{'KOLABRC'} rc openldap stop");
 
   # Make sure that no rogue demons are running
   tryConnect( '127.0.0.1', 389 ) && die "A process is already listening to port 389 (ldap)\n"
@@ -787,9 +787,9 @@
 is copied over to this slave. Please make sure that this slave is entered into the list
 of kolabhosts on the master before proceeding.
 EOS
-    kolab_system("ssh -C $master_host \'$Kolab::config{'KOLABRC'} rc $Kolab::config{'LDAPD'} stop".
+    kolab_system("ssh -C $master_host \'$Kolab::config{'KOLABRC'} rc openldap stop".
                  " && $Kolab::config{'TAR'} -C $Kolab::config{'ldapserver_statedir'} -pcf - openldap-data".
-                 " && $Kolab::config{'KOLABRC'} rc $Kolab::config{'LDAPD'} start\'".
+                 " && $Kolab::config{'KOLABRC'} rc openldap start\'".
                  " | $Kolab::config{'TAR'} -C $Kolab::config{'ldapserver_statedir'} -pxf -");
   }