richard: server/perl-kolab/Kolab Kolab.pm.in,1.1,1.2

cvs at intevation.de cvs at intevation.de
Fri Dec 30 11:32:07 CET 2005


Author: richard

Update of /kolabrepository/server/perl-kolab/Kolab
In directory doto:/tmp/cvs-serv5198/Kolab

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

* Kolab/Kolab.pm.in: replaced @bindir@/openpkg with @KOLABRC@



Index: Kolab.pm.in
===================================================================
RCS file: /kolabrepository/server/perl-kolab/Kolab/Kolab.pm.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Kolab.pm.in	17 Dec 2005 21:45:32 -0000	1.1
+++ Kolab.pm.in	30 Dec 2005 10:32:05 -0000	1.2
@@ -384,12 +384,12 @@
 {
     if ($haschanged{'slapd'}) {
         &log('K', 'Restarting OpenLDAP...');
-        system("@bindir@/openpkg rc openldap restart &");
+        system("@KOLABRC@ rc openldap restart &");
     }
 
     if ($haschanged{'saslauthd'}) {
         &log('K', 'Restarting SASLAuthd...');
-        system("@bindir@/openpkg rc sasl stop; sleep 1; @sbindir@/saslauthd -a ldap -n 5");
+        system("@KOLABRC@ rc sasl stop; sleep 1; @sbindir@/saslauthd -a ldap -n 5");
     }
 
     if ($haschanged{'apache'}) {
@@ -405,29 +405,29 @@
     if ($haschanged{'imapd'}) {
         &log('K', 'Restarting imapd...');
 	# Would it be enough with a reload here? /steffen
-        system("@bindir@/openpkg rc imapd restart");
+        system("@KOLABRC@ rc imapd restart");
     }
 
     if ($haschanged{'amavisd'}) {
         &log('K', 'Restarting amavisd...');
-        system("@bindir@/openpkg rc amavisd restart");
+        system("@KOLABRC@ rc amavisd restart");
     }
 
     if ($haschanged{'clamav'}) {
         &log('K', 'Restarting clamav...');
-        system("@bindir@/openpkg rc clamav restart");
+        system("@KOLABRC@ rc clamav restart");
     }
 
     if ($config{'proftpd-ftp'} =~ /true/i) {
         Kolab::log('K', 'Starting ProFTPd if not running');
-        system("@bindir@/openpkg rc proftpd start");
+        system("@KOLABRC@ rc proftpd start");
         if ($haschanged{'proftpd'}) {
             &log('K', 'Reloading ProFTPd...');
             kill('SIGHUP', `cat @ftpserver_pidfile@`);
         }
     } else {
         &log('K', 'Stopping ProFTPd, if running...');
-        system("@bindir@/openpkg rc proftpd stop");
+        system("@KOLABRC@ rc proftpd stop");
     }
 
     %Kolab::Conf::haschanged = ();





More information about the commits mailing list