version 1.471, 2011/05/13 02:32:40
|
version 1.472, 2011/05/13 02:58:02
|
Line 53 use LONCAPA::lonlocal;
|
Line 53 use LONCAPA::lonlocal;
|
use LONCAPA::lonssl; |
use LONCAPA::lonssl; |
use Fcntl qw(:flock); |
use Fcntl qw(:flock); |
use Apache::lonnet; |
use Apache::lonnet; |
|
use Mail::Send; |
|
|
my $DEBUG = 0; # Non zero to enable debug log entries. |
my $DEBUG = 0; # Non zero to enable debug log entries. |
|
|
Line 420 sub ReadManagerTable {
|
Line 421 sub ReadManagerTable {
|
|
|
my $tablename = $perlvar{'lonTabDir'}."/managers.tab"; |
my $tablename = $perlvar{'lonTabDir'}."/managers.tab"; |
if (!open (MANAGERS, $tablename)) { |
if (!open (MANAGERS, $tablename)) { |
logthis('<font color="red">No manager table. Nobody can manage!!</font>'); |
if (&loncapa_dns_server()) { |
return; |
&logthis('<font color="red">No manager table. Nobody can manage!!</font>'); |
|
} |
|
return; |
} |
} |
while(my $host = <MANAGERS>) { |
while(my $host = <MANAGERS>) { |
chomp($host); |
chomp($host); |
Line 446 sub ReadManagerTable {
|
Line 449 sub ReadManagerTable {
|
} |
} |
} else { |
} else { |
logthis('<font color="green"> existing host'." $host</font>\n"); |
logthis('<font color="green"> existing host'." $host</font>\n"); |
$managers{&Apache::lonnet::get_host_ip($host)} = $host; # Use info from cluster tab if clumemeber |
$managers{&Apache::lonnet::get_host_ip($host)} = $host; # Use info from cluster tab if cluster memeber |
} |
} |
} |
} |
} |
} |
Line 508 sub AdjustHostContents {
|
Line 511 sub AdjustHostContents {
|
my $me = $perlvar{'lonHostID'}; |
my $me = $perlvar{'lonHostID'}; |
|
|
foreach my $line (split(/\n/,$contents)) { |
foreach my $line (split(/\n/,$contents)) { |
if(!(($line eq "") || ($line =~ /^ *\#/) || ($line =~ /^ *$/))) { |
if(!(($line eq "") || ($line =~ /^ *\#/) || ($line =~ /^ *$/) || |
|
($line =~ /^\s*\^/))) { |
chomp($line); |
chomp($line); |
my ($id,$domain,$role,$name,$ip,$maxcon,$idleto,$mincon)=split(/:/,$line); |
my ($id,$domain,$role,$name,$ip,$maxcon,$idleto,$mincon)=split(/:/,$line); |
if ($id eq $me) { |
if ($id eq $me) { |
Line 596 sub InstallFile {
|
Line 600 sub InstallFile {
|
# |
# |
# ConfigFileFromSelector: converts a configuration file selector |
# ConfigFileFromSelector: converts a configuration file selector |
# into a configuration file pathname. |
# into a configuration file pathname. |
# It's probably no longer necessary to preserve |
# Supports the following file selectors: |
# special handling of hosts or domain as those |
# hosts, domain, dns_hosts, dns_domain |
# files have been superceded by dns_hosts, dns_domain. |
|
# The default action is just to prepend the directory |
|
# and append .tab |
|
# |
# |
# |
# |
# Parameters: |
# Parameters: |
Line 613 sub ConfigFileFromSelector {
|
Line 614 sub ConfigFileFromSelector {
|
my $tablefile; |
my $tablefile; |
|
|
my $tabledir = $perlvar{'lonTabDir'}.'/'; |
my $tabledir = $perlvar{'lonTabDir'}.'/'; |
if ($selector eq "hosts") { |
if (($selector eq "hosts") || ($selector eq "domain") || |
$tablefile = $tabledir."hosts.tab"; |
($selector eq "dns_hosts") || ($selector eq "dns_domain")) { |
} elsif ($selector eq "domain") { |
|
$tablefile = $tabledir."domain.tab"; |
|
} else { |
|
$tablefile = $tabledir.$selector.'.tab'; |
$tablefile = $tabledir.$selector.'.tab'; |
} |
} |
return $tablefile; |
return $tablefile; |
|
|
} |
} |
# |
# |
# PushFile: Called to do an administrative push of a file. |
# PushFile: Called to do an administrative push of a file. |
Line 647 sub PushFile {
|
Line 644 sub PushFile {
|
# supported: |
# supported: |
# hosts.tab ($filename eq host). |
# hosts.tab ($filename eq host). |
# domain.tab ($filename eq domain). |
# domain.tab ($filename eq domain). |
|
# dns_hosts.tab ($filename eq dns_host). |
|
# dns_domain.tab ($filename eq dns_domain). |
# Construct the destination filename or reject the request. |
# Construct the destination filename or reject the request. |
# |
# |
# lonManage is supposed to ensure this, however this session could be |
# lonManage is supposed to ensure this, however this session could be |
Line 679 sub PushFile {
|
Line 678 sub PushFile {
|
} else { |
} else { |
&logthis('<font color="green"> Installed new '.$tablefile |
&logthis('<font color="green"> Installed new '.$tablefile |
."</font>"); |
."</font>"); |
|
my $adminmail = $perlvar{'lonAdmEMail'}; |
|
my $admindom = &Apache::lonnet::host_domain($perlvar{'lonHostID'}); |
|
if ($admindom ne '') { |
|
my %domconfig = |
|
&Apache::lonnet::get_dom('configuration',['contacts'],$admindom); |
|
if (ref($domconfig{'contacts'}) eq 'HASH') { |
|
if ($domconfig{'contacts'}{'adminemail'} ne '') { |
|
$adminmail = $domconfig{'contacts'}{'adminemail'}; |
|
} |
|
} |
|
} |
|
if ($adminmail =~ /^[^\@]+\@[^\@]+$/) { |
|
my $msg = new Mail::Send; |
|
my $senderaddress = $perlvar{'lonSysEMail'}; |
|
$msg->to($adminmail); |
|
$msg->subject('LON-CAPA DNS update on '.$perlvar{'lonHostID'}); |
|
if ($senderaddress) { |
|
$msg->add('From',$senderaddress); |
|
} |
|
$msg->add('Content-type','text/plain; charset=UTF-8'); |
|
if (my $fh = $msg->open()) { |
|
print $fh 'Update to '.$tablefile.' from Cluster Manager '. |
|
$client."\n"; |
|
$fh->close; |
|
} |
|
} |
} |
} |
|
|
|
|
# Indicate success: |
# Indicate success: |
|
|
return "ok"; |
return "ok"; |
|
|
} |
} |
|
|
|
sub loncapa_dns_server { |
|
my $lonhost = &Apache::lonnet::get_host_ip($perlvar{'lonHostID'}); |
|
my $hoststable = "$perlvar{'lonTabDir'}/hosts.tab"; |
|
my $is_dns_server; |
|
if (!open(HOSTS,"<$hoststable")) { |
|
&logthis('<font color="yellow">Could not open hosts.tab to check for LON-CAPA DNS servers.</font>'); |
|
while (my $host = <HOSTS>) { |
|
chomp($host); |
|
$host =~ s/(^\s+|\s+$)//g; |
|
if ($host =~ /^\Q^$lonhost\E/) { |
|
$is_dns_server = 1; |
|
last; |
|
} |
|
} |
|
close(HOSTS); |
|
} |
|
return $is_dns_server; |
|
} |
|
|
# |
# |
# Called to re-init either lonc or lond. |
# Called to re-init either lonc or lond. |
# |
# |