Diff for /loncom/configuration/Configuration.pm between versions 1.4 and 1.6

version 1.4, 2002/05/16 00:00:16 version 1.6, 2002/05/17 14:03:04
Line 43  my $confdir='/etc/httpd/conf/'; Line 43  my $confdir='/etc/httpd/conf/';
 sub read_conf {  sub read_conf {
     my (@conf_files)=@_;      my (@conf_files)=@_;
     my %perlvar;      my %perlvar;
     foreach my $filename (@conf_files) {      foreach my $filename (@conf_files,'loncapa_apache.conf') {
  open(CONFIG,'<'.$confdir.$filename) or die("Can't read $confdir$filename");   open(CONFIG,'<'.$confdir.$filename) or die("Can't read $confdir$filename");
  while (my $configline=<CONFIG>) {   while (my $configline=<CONFIG>) {
     if ($configline =~ /^[^\#]*PerlSetVar/) {      if ($configline =~ /^[^\#]*PerlSetVar/) {
Line 71  B<LONCAPA::Configuration> - configuratio Line 71  B<LONCAPA::Configuration> - configuratio
  use lib '/home/httpd/lib/perl/';   use lib '/home/httpd/lib/perl/';
  use LONCAPA::Configuration;   use LONCAPA::Configuration;
   
  LONCAPA::Configuration::read_conf('access.conf','loncapa.conf');   LONCAPA::Configuration::read_conf('loncapa_apache.conf','loncapa.conf');
   
 In the future, standard invocation of the command will be:  
   
  LONCAPA::Configuration::read_conf('loncapa.conf');  
   
 F<access.conf> is slowly becoming deprecated.  (We are currently  
 trying to support backwards compatibility.)  
   
 =head1 DESCRIPTION  =head1 DESCRIPTION
   

Removed from v.1.4  
changed lines
  Added in v.1.6


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