richard: server/kolabd/kolabd ChangeLog, 1.23, 1.24 kolab_bootstrap.in, 1.11, 1.12

cvs at intevation.de cvs at intevation.de
Fri Dec 30 11:25:23 CET 2005


Author: richard

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

Modified Files:
	ChangeLog kolab_bootstrap.in 
Log Message:
Change @bindir@/openpkg with @KOLABRC@ to allow other distributions to use
a replacement script for @bindir@/openpkg. 

* dist_conf/{kolab,suse}: added KOLABRC variable
* kolab_bootstrap.in: replaced @bindir@/openpkg with @KOLABRC@
* namespace/kolab.in: replaced @bindir@/openpkg with @KOLABRC@



Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- ChangeLog	29 Dec 2005 09:25:53 -0000	1.23
+++ ChangeLog	30 Dec 2005 10:25:21 -0000	1.24
@@ -1,3 +1,9 @@
+2005-12-30 Marcus Hüwe <suse-tux at gmx.de>
+	Patch committed by Richard Bos, see issue1047
+	* dist_conf/{kolab,suse}: added KOLABRC variable
+	* kolab_bootstrap.in: replaced @bindir@/openpkg with @KOLABRC@
+	* namespace/kolab.in: replaced @bindir@/openpkg with @KOLABRC@
+
 2005-12-27  Martin Konold <martin.konold at erfrakon.de>
 	Patch from Richard Bos
 	* kolab_ca.sh.in: Changed $PREFIX/bin to @bindir@

Index: kolab_bootstrap.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/kolab_bootstrap.in,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- kolab_bootstrap.in	28 Dec 2005 14:21:30 -0000	1.11
+++ kolab_bootstrap.in	30 Dec 2005 10:25:21 -0000	1.12
@@ -90,7 +90,7 @@
     print ("Error: Found $name running on Port $port\n");
     print ("Check your installation!\n");
     print ("You must stop the service $name before running Kolab\n");
-    print ("You may try to execute \"@bindir@/openpkg rc all stop\" initially\n");
+    print ("You may try to execute \"@KOLABRC@ rc all stop\" initially\n");
     exit 1;
   }
 }
@@ -626,7 +626,7 @@
 
    if ($ldap_uri =~ /127\.0\.0\.1/ || $ldap_uri =~ /localhost/) {
       print "\nkill temporary slapd\n\n";
-      system("@bindir@/openpkg rc openldap stop");
+      system("@KOLABRC@ rc openldap stop");
       sleep 1; # actually race should be impossible
       system("killall -9 slapd >/dev/null 2>&1");
    }
@@ -693,7 +693,7 @@
   ##### Slave server setup
 
   print "stop running slapd (if any)\n";
-  kolab_system("@bindir@/openpkg rc openldap stop");
+  kolab_system("@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"
@@ -811,9 +811,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 -CA $master_host @bindir@/openpkg rc openldap stop");
+  kolab_system("ssh -CA $master_host @KOLABRC@ rc openldap stop");
   kolab_system("ssh -CA $master_host @libdir@/openpkg/tar -C @ldapserver_statedir@ -pcf - openldap-data | @libdir@/openpkg/tar -C @ldapserver_statedir@ -pxf -");
-  kolab_system("ssh -CA $master_host @bindir@/openpkg rc openldap start");
+  kolab_system("ssh -CA $master_host @KOLABRC@ rc openldap start");
 
   print "Updating configuration, please ignore any initial errors from kolabconf\n\n";
   my $cfg;
@@ -907,6 +907,6 @@
 
 #system("@sysconfdir@/kolab/kolab_sslcert.sh $fqdn");
 print "kolab is now ready to run!\n";
-print "please run '@bindir@/openpkg rc all start'\n";
+print "please run '@KOLABRC@ rc all start'\n";
 print ("Use login=manager and passwd=$bind_pw when you log into\n");
 print ("the webinterface https://$fqdn/admin !\n");





More information about the commits mailing list