version 1.54, 2007/04/20 18:14:26
|
version 1.58, 2007/05/22 23:16:47
|
Line 421 my $lonAdmEMail;
|
Line 421 my $lonAdmEMail;
|
while (!$flag) { |
while (!$flag) { |
print(<<END); |
print(<<END); |
|
|
**** Server Administrator's E-mail **** |
**** Server Administrators E-mail **** |
E-mail address of the person who will manage this machine |
E-mail address of the person who will manage this machine |
[should be in the form somebody\@somewhere] |
[should be in the form somebody\@somewhere] |
ENTER ADMIN E-MAIL ADDRESS: |
ENTER ADMIN E-MAIL ADDRESS: |
Line 477 END
|
Line 477 END
|
|
|
# update loncapa.conf |
# update loncapa.conf |
my $confdir = '/etc/httpd/conf/'; |
my $confdir = '/etc/httpd/conf/'; |
if ('<DIST />' eq 'sles10' || '<DIST />' eq 'suse10.1') { |
if ('<DIST />' eq 'sles10' || '<DIST />' eq 'suse10.1' || '<DIST />' eq 'suse10.2') { |
$confdir = '/etc/apache2/'; |
$confdir = '/etc/apache2/'; |
} |
} |
my $filename='loncapa.conf'; |
my $filename='loncapa.conf'; |
Line 534 END
|
Line 534 END
|
</file> |
</file> |
<file> |
<file> |
<target dist='default'>/etc/httpd/conf/</target> |
<target dist='default'>/etc/httpd/conf/</target> |
<target dist='sles10 suse10.1'>/etc/apache2/</target> |
<target dist='sles10 suse10.1 suse10.2'>/etc/apache2/</target> |
<perlscript mode='fg'> |
<perlscript mode='fg'> |
sub securesetting { |
sub securesetting { |
my (%perlvar)=@_; |
my (%perlvar)=@_; |
Line 606 my %perlvarstatic;
|
Line 606 my %perlvarstatic;
|
} |
} |
close(CONFIG); |
close(CONFIG); |
} |
} |
if (!$domainDescription && $lonCluster ne 'existing') { |
|
open(IN,'<../'.$lonCluster.'_domain.tab'); |
my (@hosts_files, @domain_files); |
while(<IN>) { |
if ( $lonCluster ne 'existing') { |
if (/^$perlvar{'lonDefDomain'}\:/) { |
push(@domain_files,'../'.$lonCluster.'_domain.tab', |
(undef,$domainDescription,$domainTabExtras)=split(/:/,$_,3); |
'../'.$lonCluster.'_dns_domain.tab'); |
chomp($domainDescription); |
push(@hosts_files,'../'.$lonCluster.'_hosts.tab', |
chomp($domainTabExtras); |
'../'.$lonCluster.'_dns_hosts.tab'); |
# the remianing field (primary lib server) is handled later |
} |
$domainTabExtras = join(':',(split(/:/,$domainTabExtras))[0..5]); |
push(@domain_files,'/home/httpd/lonTabs/domain.tab', |
last; |
'/home/httpd/lonTabs/dns_domain.tab'); |
} |
push(@hosts_files,'/home/httpd/lonTabs/hosts.tab', |
} |
'/home/httpd/lonTabs/dns_hosts.tab'); |
close(IN); |
|
} |
|
if (!$domainDescription) { |
if (!$domainDescription) { |
open(IN,'</home/httpd/lonTabs/domain.tab'); |
foreach my $file (@domain_files) { |
while(<IN>) { |
open(IN,'<'.$file); |
if (/^$perlvar{'lonDefDomain'}\:/) { |
while(my $line = <IN>) { |
(undef,$domainDescription,$domainTabExtras)=split(/:/,$_,3); |
if ($line =~ /^\Q$perlvar{'lonDefDomain'}\E\:/) { |
chomp($domainDescription); |
(undef,$domainDescription,$domainTabExtras)=split(/:/,$line,3); |
chomp($domainTabExtras); |
chomp($domainDescription); |
# the remianing field (primary lib server) is handled later |
chomp($domainTabExtras); |
$domainTabExtras = join(':',(split(/:/,$domainTabExtras))[0..5]); |
# the remianing field (primary lib server) is handled later |
last; |
$domainTabExtras = join(':',(split(/:/,$domainTabExtras))[0..5]); |
} |
last; |
} |
} |
close(IN); |
} |
|
close(IN); |
|
last if ($domainDescription); |
|
} |
} |
} |
if (!$primaryLibServer and $lonCluster ne 'existing') { |
|
open(IN,'<../'.$lonCluster.'_domain.tab'); |
while(!$primaryLibServ && (@hosts_file || @domain_files)) { |
while(<IN>) { |
my $file = shift(@domain_files); |
if (/^$perlvar{'lonDefDomain'}\:/) { |
open(IN,'<'.$file); |
(undef,undef,undef,undef,undef,undef,undef,undef, |
while(my $line = <IN>) { |
$primaryLibServer)=split(/:/,$_); |
if ($line =~ /^\Q$perlvar{'lonDefDomain'}\E\:/) { |
|
$primaryLibServer=(split(/:/,$line))[8]; |
chomp($primaryLibServer); |
chomp($primaryLibServer); |
} |
} |
} |
} |
close(IN); |
close(IN); |
if (!$primaryLibServer) { |
last if ($primaryLibServer); |
open(IN,'<../'.$lonCluster.'_hosts.tab'); |
$file = shift(@hosts_files); |
while(<IN>) { |
open(IN,'<'.$file); |
if (/^([^\:]+)\:\Q$perlvar{'lonDefDomain'}\E\:library\:/) { |
while(my $line = <IN>) { |
push(@libservers,$1); |
if ($line =~ /^([^\:]+)\:\Q$perlvar{'lonDefDomain'}\E\:library\:/) { |
} |
push(@libservers,$1); |
} |
} |
close(IN); |
} |
if (@libservers == 1) { |
# make list unique |
$primaryLibServer = $libservers[0]; |
@libservers = keys(%{{ map { $_ => 1 } (@libservers) }}); |
} |
close(IN); |
} |
if (@libservers == 1) { |
} |
$primaryLibServer = $libservers[0]; |
if (!$primaryLibServer) { |
} |
open(IN,'</home/httpd/lonTabs/domain.tab'); |
|
while(<IN>) { |
|
if (/^$perlvar{'lonDefDomain'}\:/) { |
|
(undef,undef,undef,undef,undef,undef,undef,undef, |
|
$primaryLibServer)=split(/:/,$_); |
|
chomp($primaryLibServer); |
|
} |
|
close(IN); |
|
} |
|
if (!$primaryLibServer) { |
|
open(IN,'</home/httpd/lonTabs/hosts.tab'); |
|
while(<IN>) { |
|
if (/^([^\:]+)\:\Q$perlvar{'lonDefDomain'}\E\:library\:/) { |
|
push(@libservers,$1); |
|
} |
|
} |
|
close(IN); |
|
if (@libservers == 1) { |
|
$primaryLibServer = $libservers[0]; |
|
} |
|
} |
|
} |
} |
|
|
# implement editing logic below, interactively |
# implement editing logic below, interactively |
Line 930 unless (-l "<TARGET />") {
|
Line 912 unless (-l "<TARGET />") {
|
$line2insert=<<END; |
$line2insert=<<END; |
$perlvar{'lonHostID'}:$perlvar{'lonDefDomain'}:$perlvar{'lonRole'}:$hostname |
$perlvar{'lonHostID'}:$perlvar{'lonDefDomain'}:$perlvar{'lonRole'}:$hostname |
END |
END |
|
if (!$domainTabExtras) { |
|
$domainTabExtras=':::::'; |
|
} |
$domaininsert="$perlvar{'lonDefDomain'}:$domainDescription:$domainTabExtras:$primaryLibServer\n"; |
$domaininsert="$perlvar{'lonDefDomain'}:$domainDescription:$domainTabExtras:$primaryLibServer\n"; |
if ($lonCluster eq 'standalone') { |
if ($lonCluster eq 'standalone') { |
open(OUT,'>../'.$lonCluster.'_hosts.tab') or |
open(OUT,'>../'.$lonCluster.'_hosts.tab') or |