[BACK]Return to loncontrol CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom / init.d

Diff for /loncom/init.d/loncontrol between versions 1.38 and 1.39

version 1.38, 2009/07/06 00:07:15 version 1.39, 2010/03/25 01:37:09
Line 119  if ($command eq "restart") { Line 119  if ($command eq "restart") {
     system("su www -c '/home/httpd/perl/loncron --justcheckdaemons'");      system("su www -c '/home/httpd/perl/loncron --justcheckdaemons'");
 } elsif (($command eq "stop") || ($command eq 'start') || ($command eq 'status')) {  } elsif (($command eq "stop") || ($command eq 'start') || ($command eq 'status')) {
     my $iptables = &LONCAPA::Firewall::get_pathto_iptables();      my $iptables = &LONCAPA::Firewall::get_pathto_iptables();
     my $fw_chain = &LONCAPA::Firewall::get_fw_chain($iptables);      my @fw_chains = &LONCAPA::Firewall::get_fw_chains($iptables);
     my $lond_port = &LONCAPA::Firewall::get_lond_port();      my $lond_port = &LONCAPA::Firewall::get_lond_port();
     my %iphost = &Apache::lonnet::get_iphost();      my %iphost = &Apache::lonnet::get_iphost();
     if ($command eq 'stop') {      if ($command eq 'stop') {
Line 130  if ($command eq "restart") { Line 130  if ($command eq "restart") {
     &stop_daemon($daemon,$killallname);      &stop_daemon($daemon,$killallname);
         }          }
         my $firewall_result =           my $firewall_result = 
             &LONCAPA::Firewall::firewall_close_port($iptables,$fw_chain,$lond_port,[$lond_port]);              &LONCAPA::Firewall::firewall_close_port($iptables,\@fw_chains,$lond_port,[$lond_port]);
         if ($firewall_result) {          if ($firewall_result) {
             print "$firewall_result\n";              print "$firewall_result\n";
         }          }
         &clean_sockets();          &clean_sockets();
     } elsif ($command eq "start") {      } elsif ($command eq "start") {
         my $firewall_result =           my $firewall_result = 
             &LONCAPA::Firewall::firewall_open_port($iptables,$fw_chain,$lond_port,\%iphost,[$lond_port]);              &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 'ok') || ($firewall_result eq 'inactive firewall')) {
             if ($firewall_result eq 'inactive firewall') {              if ($firewall_result eq 'inactive firewall') {
                 print "WARNING: iptables firewall is currently inactive\n";                  print "WARNING: iptables firewall is currently inactive\n";
Line 166  if ($command eq "restart") { Line 166  if ($command eq "restart") {
             print 'The iptables firewall is not active'."\n";              print 'The iptables firewall is not active'."\n";
         }          }
         if ($lond_port) {          if ($lond_port) {
             if (&LONCAPA::Firewall::firewall_is_port_open($iptables,$fw_chain,$lond_port,$lond_port,\%iphost)) {              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";                  print "The LON-CAPA port ($lond_port) is open in firewall.\n";
             } elsif (&LONCAPA::Firewall::firewall_is_active) {              } elsif (&LONCAPA::Firewall::firewall_is_active) {
                 print "The LON-CAPA port ($lond_port) is NOT open in running firewall!\n";                  print "The LON-CAPA port ($lond_port) is NOT open in running firewall!\n";
Removed from v.1.38  
changed lines
  Added in v.1.39

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>