--- loncom/init.d/loncontrol	2007/05/31 05:20:06	1.30
+++ loncom/init.d/loncontrol	2010/12/30 18:40:38	1.41
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 #
-# $Id: loncontrol,v 1.30 2007/05/31 05:20:06 albertel Exp $
+# $Id: loncontrol,v 1.41 2010/12/30 18:40:38 raeburn Exp $
 #
 # The LearningOnline Network with CAPA
 #
@@ -32,98 +32,33 @@
 # 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, lonmaxima
+# processnames: lonc, lond, lonsql, lonmaxima, lonr
 # pidfiles: /home/httpd/perl/logs/lon*.pid
 # config: /etc/httpd/conf/loncapa.conf
 # config: /home/httpd/lonTabs/hosts.tab
 # config: /home/httpd/lonTabs/spare.tab
+# SuSE chkconfig/insserv info
+### BEGIN INIT INFO
+# Provides:       loncapa
+# Required-Start: SuSEfirewall2_setup mysql apache2 $network $remote_fs
+# Should-Start:   $ALL
+# Required-Stop:
+# Default-Start:  3 4 5
+# Default-Stop:
+# Description:    Starts the LON-CAPA services
+### END INIT INFO
+
+use strict;
+use lib '/home/httpd/lib/perl/';
+use LONCAPA::Configuration;
+use LONCAPA::Firewall;
+use Apache::lonnet;
 
-$command=$ARGV[0]; $command=~s/[^a-z]//g;
+my $command=$ARGV[0]; $command=~s/[^a-z]//g;
 
 $ENV{'PATH'}="/sbin:/bin:/usr/sbin:/usr/bin:/usr/X11R6/bin:/root/bin";
 $ENV{'BASH_ENV'}="";
 
-{ # Firewall variable scoping
-    # 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;
-
-sub firewall_open_port {
-    return if (! &firewall_is_active);
-    if (! `$iptables -L -n 2>/dev/null | grep $fw_chain | wc -l`) { return; }
-    # iptables is running with our chain
-    #
-    # We could restrict the servers allowed to attempt to communicate
-    # here, but the logistics of updating the /home/httpd/lonTabs/host.tab
-    # file are likely to be a problem
-    foreach my $port ($lond_port,$lonhttpd_port) {
-        print "Opening firewall access on port $port.\n";
-
-        my $firewall_command = 
-            "$iptables -I $fw_chain -p tcp -d 0/0 --dport $port -j ACCEPT";
-        system($firewall_command);
-        my $return_status = $?>>8;
-        if ($return_status == 1) {
-            # Error
-            print "Error opening port.\n";
-        } elsif ($return_status == 2) {
-            # Bad command
-            print "Bad command error opening port.  Command was\n".
-                "  ".$firewall_command."\n";
-        }
-    }
-    
-}
-
-sub firewall_is_port_open {
-    # returns 1 if the firewall port is open, 0 if not.
-    #
-    # check if firewall is active or installed
-    return if (! &firewall_is_active);
-    if (`$iptables -L -n 2>/dev/null | grep "tcp dpt:$port"`) { 
-        return 1;
-    } else {
-        return 0;
-    }
-}
-
-sub firewall_is_active {
-    if (-e '/proc/net/ip_tables_names') {
-        return 1;
-    } else {
-        return 0;
-    }
-}
-
-sub firewall_close_port {
-    return if (! &firewall_is_active);
-    foreach my $port ($lond_port,$lonhttpd_port) {
-        print "Closing firewall access on port $port.\n";
-        my $firewall_command = 
-            "$iptables -D $fw_chain -p tcp -d 0/0 --dport $port -j ACCEPT";
-        system($firewall_command);
-        my $return_status = $?>>8;
-        if ($return_status == 1) {
-            # Error
-            print "Error closing port.\n";
-        } elsif ($return_status == 2) {
-            # Bad command
-            print "Bad command error closing port.  Command was\n".
-                "  ".$firewall_command."\n";
-        }
-    }
-}
-
-} # End firewall variable scope
-
 sub stop_daemon {
     my ($daemon,$killallname)=@_;
     my $pidfile="/home/httpd/perl/logs/$daemon.pid";
@@ -134,7 +69,10 @@ sub stop_daemon {
 	my $daemonpid=<PIDFILE>;
 	chomp($daemonpid);
 	kill TERM => $daemonpid;
-	sleep 1;
+	my $count=0;
+	while ($count++ < 5 && kill(0 => $daemonpid)) {
+	    sleep 1;
+	}
 	if (kill 0 => $daemonpid) {
 	    kill KILL => $daemonpid;
 	    sleep 1;
@@ -160,9 +98,11 @@ sub stop_daemon {
 
 sub clean_sockets {
     opendir(SOCKETS,"/home/httpd/sockets/");
+    my $perlvarref=&LONCAPA::Configuration::read_conf();
+    return if (ref($perlvarref) ne 'HASH');
     while (my $fname=readdir(SOCKETS)) {
 	next if (-d $fname
-		 || $fname=~/(mysqlsock|maximasock|\Q$perlvar{'lonSockDir'}\E)/);
+		 || $fname=~/(mysqlsock|maximasock|\Q$perlvarref->{'lonSockDir'}\E)/);
 	unlink("/home/httpd/sockets/$fname");
     }
 }
@@ -170,7 +110,7 @@ sub clean_sockets {
 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','lonmaxima') {
+    foreach my $daemon ('lonsql','lond','lonc','lonmemcached','lonmaxima','lonr') {
 	my $killallname=$daemon;
 	if ($daemon eq 'lonc') { $killallname='loncnew'; }
 	&stop_daemon($daemon,$killallname);
@@ -178,40 +118,78 @@ if ($command eq "restart") {
     print 'Starting LON-CAPA client and daemon processes (please be patient)'.
 	"\n";
     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','lonmaxima') {
-	my $killallname=$daemon;
-	if ($daemon eq 'lonc') { $killallname='loncnew'; }
-	&stop_daemon($daemon,$killallname);
+} elsif (($command eq "stop") || ($command eq 'start') || ($command eq 'status')) {
+    my $iptables = &LONCAPA::Firewall::get_pathto_iptables();
+    my @fw_chains = &LONCAPA::Firewall::get_fw_chains($iptables);
+    my $lond_port = &LONCAPA::Firewall::get_lond_port();
+    my %iphost;
+    if ($command eq 'stop') {
+        print 'Stopping LON-CAPA'."\n";
+        foreach my $daemon ('lonsql','lond','lonc','lonmemcached','lonmaxima','lonr') {
+	    my $killallname=$daemon;
+	    if ($daemon eq 'lonc') { $killallname='loncnew'; }
+	    &stop_daemon($daemon,$killallname);
+        }
+        my $firewall_result = 
+            &LONCAPA::Firewall::firewall_close_port($iptables,\@fw_chains,$lond_port,\%iphost,[$lond_port]);
+        if ($firewall_result) {
+            print "$firewall_result\n";
+        }
+        &clean_sockets();
+    } elsif ($command eq "start") {
+        %iphost = &Apache::lonnet::get_iphost();
+        my $firewall_result = 
+            &LONCAPA::Firewall::firewall_open_port($iptables,\@fw_chains,$lond_port,\%iphost,[$lond_port]);
+        if (($firewall_result eq 'ok') || ($firewall_result eq 'inactive firewall')) {
+            if ($firewall_result eq 'inactive firewall') {
+                print "WARNING: iptables firewall is currently inactive\n";
+            }
+            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'");
+        } else {
+            print "Not starting LON-CAPA\n";
+            if ($firewall_result eq 'port number unknown') {
+                print "Could not check for status of LON-CAPA port in running firewall - port number unknown.  \n";
+            } elsif ($firewall_result) {
+                print "$firewall_result\n";
+            }
+        }
+    } elsif ($command eq "status") {
+        %iphost = &Apache::lonnet::get_iphost();
+        my $response=`/bin/cat /home/httpd/perl/logs/*.pid 2>&1`;
+        if ($response=~/No such file or directory/) {
+	    print 'LON-CAPA is not running.'."\n";
+        } else {
+	    print 'LON-CAPA is running.'."\n";
+	    system("su www -c '/home/httpd/perl/loncron --justcheckconnections'");
+        }
+        if (! &LONCAPA::Firewall::firewall_is_active()) {
+            print 'The iptables firewall is not active'."\n";
+        }
+        if ($lond_port) {
+            my $londopen;
+            foreach my $fw_chain (@fw_chains) { 
+                my $numopen = &LONCAPA::Firewall::firewall_is_port_open($iptables,$fw_chain,$lond_port,$lond_port,\%iphost);
+                $londopen += $numopen; 
+            }
+            if ($londopen) {
+                print "The LON-CAPA port ($lond_port) is open in firewall.\n";
+            } elsif (&LONCAPA::Firewall::firewall_is_active) {
+                print "The LON-CAPA port ($lond_port) is NOT open in running firewall!\n";
+            }
+        } else {
+            if (&LONCAPA::Firewall::firewall_is_active()) {
+                print "Could not check for status of LON-CAPA port in running firewall - port number unknown.\n";
+            } else {
+                print "LON-CAPA port number is unknown, and firewall is not running.\n";
+            }
+        }
     }
-    &firewall_close_port();
-    &clean_sockets();
-} 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/) {
-	print 'LON-CAPA is not running.'."\n";
-    } else {
-	print 'LON-CAPA is running.'."\n";
-	system("su www -c '/home/httpd/perl/loncron --justcheckconnections'");
-    }
-    if (! &firewall_is_active) {
-        print 'The iptables firewall is not active'."\n";
-    }
-    if (&firewall_is_port_open()) {
-        print 'The LON-CAPA port is open in firewall.'."\n";
-    } elsif (&firewall_is_active) {
-        print 'The LON-CAPA port is NOT open in running firewall!'."\n";
-    }
 } else {
-    print 'You need to specify one of restart|stop|start|status on the command line.'."\n";
+    print "You need to specify one of reload|restart|stop|start|status on the command line.\n";
 }