version 1.42, 2006/08/25 21:20:11
|
version 1.43, 2006/09/15 20:49:24
|
Line 1172 sub GetHostIterator {
|
Line 1172 sub GetHostIterator {
|
# |
# |
|
|
|
|
my $confdir='/etc/httpd/conf/'; |
my @confdirs=('/etc/httpd/conf/','/etc/apache2/'); |
|
|
# ------------------- Subroutine read_conf: read LON-CAPA server configuration. |
# ------------------- Subroutine read_conf: read LON-CAPA server configuration. |
# This subroutine reads PerlSetVar values out of specified web server |
# This subroutine reads PerlSetVar values out of specified web server |
Line 1180 my $confdir='/etc/httpd/conf/';
|
Line 1180 my $confdir='/etc/httpd/conf/';
|
sub read_conf |
sub read_conf |
{ |
{ |
my (@conf_files)=@_; |
my (@conf_files)=@_; |
my %perlvar; |
my (%perlvar,%configdirs); |
foreach my $filename (@conf_files,'loncapa_apache.conf') |
foreach my $filename (@conf_files,'loncapa_apache.conf') { |
{ |
my $configdir = ''; |
if($DebugLevel > 3) { |
$configdirs{$filename} = [@confdirs]; |
print STDERR ("Going to read $confdir.$filename\n"); |
while ($configdir eq '' && @{$configdirs{$filename}} > 0) { |
} |
my $testdir = shift(@{$configdirs{$filename}}); |
open(CONFIG,'<'.$confdir.$filename) or |
if (-e $testdir.$filename) { |
die("Can't read $confdir$filename"); |
$configdir = $testdir; |
while (my $configline=<CONFIG>) |
} |
{ |
} |
if ($configline =~ /^[^\#]*PerlSetVar/) |
if ($configdir eq '') { |
{ |
die("Couldn't find a directory containing $filename"); |
my ($unused,$varname,$varvalue)=split(/\s+/,$configline); |
} |
|
if($DebugLevel > 3) { |
|
print STDERR ("Going to read $configdir.$filename\n"); |
|
} |
|
open(CONFIG,'<'.$configdir.$filename) or |
|
die("Can't read $configdir$filename"); |
|
while (my $configline=<CONFIG>) { |
|
if ($configline =~ /^[^\#]*PerlSetVar/) { |
|
my ($unused,$varname,$varvalue)=split(/\s+/,$configline); |
chomp($varvalue); |
chomp($varvalue); |
$perlvar{$varname}=$varvalue; |
$perlvar{$varname}=$varvalue; |
} |
} |
} |
} |
close(CONFIG); |
close(CONFIG); |
} |
} |
if($DebugLevel > 3) { |
if($DebugLevel > 3) { |
print STDERR "Dumping perlvar:\n"; |
print STDERR "Dumping perlvar:\n"; |
foreach my $var (keys %perlvar) { |
foreach my $var (keys %perlvar) { |