--- loncom/init.d/loncontrol	2005/02/14 00:29:48	1.24
+++ loncom/init.d/loncontrol	2007/04/03 00:47:28	1.29
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 #
-# $Id: loncontrol,v 1.24 2005/02/14 00:29:48 albertel Exp $
+# $Id: loncontrol,v 1.29 2007/04/03 00:47:28 albertel Exp $
 #
 # The LearningOnline Network with CAPA
 #
@@ -32,7 +32,7 @@
 # chkconfig: 345 95 5
 # description: LON-CAPA is a "network of knowledge".  It is used to \
 # distribute knowledge resources and instructional management.
-# processnames: lonc, lond, lonsql
+# processnames: lonc, lond, lonsql, lonmaxima
 # pidfiles: /home/httpd/perl/logs/lon*.pid
 # config: /etc/httpd/conf/loncapa.conf
 # config: /home/httpd/lonTabs/hosts.tab
@@ -47,6 +47,12 @@ $ENV{'BASH_ENV'}="";
     # Firewall code is based on the code in FC2 /etc/init.d/ntpd
     my $fw_chain = 'RH-Firewall-1-INPUT';
     my $iptables = '/sbin/iptables';
+    if (! -e $iptables) {
+	$iptables = '/usr/sbin/iptables';
+	if (! -e $iptables) {
+	    print("Unable to find iptables command\n");
+	}
+    }
     my $lond_port = 5663;
     my $lonhttpd_port = 8080;
 
@@ -128,10 +134,10 @@ sub stop_daemon {
 	my $daemonpid=<PIDFILE>;
 	chomp($daemonpid);
 	kill TERM => $daemonpid;
-	sleep 2;
+	sleep 1;
 	if (kill 0 => $daemonpid) {
 	    kill KILL => $daemonpid;
-	    sleep 2;
+	    sleep 1;
 	    if (kill 0 => $daemonpid) {
 		print("failed to kill");
 	    } else {
@@ -153,19 +159,10 @@ sub stop_daemon {
 }
 
 
-if (($command eq "restartold") or ($command eq "reloadold")) {
+if ($command eq "restart") {
     print 'Restarting LON-CAPA'."\n";
     print 'Ending LON-CAPA client and daemon processes'."\n";
-    foreach my $daemon ('lonsql','lond','lonc','lonhttpd','lonmemcached') {
-	&stop_daemon($daemon,$daemon);
-    }
-    print 'Starting LON-CAPA client and daemon processes (please be patient)'.
-	"\n";
-    system("su www -c '/home/httpd/perl/loncron --oldlonc --justcheckdaemons'");
-} elsif (($command eq "restart") or ($command eq "reload")) {
-    print 'Restarting LON-CAPA'."\n";
-    print 'Ending LON-CAPA client and daemon processes'."\n";
-    foreach my $daemon ('lonsql','lond','lonc','lonhttpd','lonmemcached') {
+    foreach my $daemon ('lonsql','lond','lonc','lonhttpd','lonmemcached','lonmaxima') {
 	my $killallname=$daemon;
 	if ($daemon eq 'lonc') { $killallname='loncnew'; }
 	&stop_daemon($daemon,$killallname);
@@ -175,24 +172,21 @@ if (($command eq "restartold") or ($comm
     system("su www -c '/home/httpd/perl/loncron --justcheckdaemons'");
 } elsif ($command eq "stop") {
     print 'Stopping LON-CAPA'."\n";
-    foreach my $daemon ('lonsql','lond','lonc','lonhttpd','lonmemcached') {
+    foreach my $daemon ('lonsql','lond','lonc','lonhttpd','lonmemcached','lonmaxima') {
 	my $killallname=$daemon;
 	if ($daemon eq 'lonc') { $killallname='loncnew'; }
 	&stop_daemon($daemon,$killallname);
     }
     &firewall_close_port();
-} elsif ($command eq "startold") {
-    &firewall_open_port();
-    print 'Starting LON-CAPA'."\n";
-    print 'Starting LON-CAPA client and daemon processes (please be patient)'.
-	"\n"; 
-    system("su www -c '/home/httpd/perl/loncron --oldlonc --justcheckdaemons'");
 } elsif ($command eq "start") {
     &firewall_open_port();
     print 'Starting LON-CAPA'."\n";
     print 'Starting LON-CAPA client and daemon processes (please be patient)'.
 	"\n"; 
     system("su www -c '/home/httpd/perl/loncron --justcheckdaemons'");
+} elsif ($command eq "reload") {
+    print 'Reload LON-CAPA config files'."\n";
+    system("su www -c '/home/httpd/perl/loncron --justreload'");
 } elsif ($command eq "status") {
     $response=`/bin/cat /home/httpd/perl/logs/*.pid 2>&1`;
     if ($response=~/No such file or directory/) {