[LON-CAPA-cvs] cvs: loncom /configuration Configuration.pm

[harris41]

harris41		Thu May 16 13:24:07 2002 EDT

  Modified files:              
    /loncom/configuration	Configuration.pm 
  Log:
  always always always read values out of loncapa_apache.conf
  
  
Index: loncom/configuration/Configuration.pm
diff -u loncom/configuration/Configuration.pm:1.4 loncom/configuration/Configuration.pm:1.5
--- loncom/configuration/Configuration.pm:1.4	Wed May 15 20:00:16 2002
+++ loncom/configuration/Configuration.pm	Thu May 16 13:24:06 2002
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Configuration file reader
 #
-# $Id: Configuration.pm,v 1.4 2002/05/16 00:00:16 harris41 Exp $
+# $Id: Configuration.pm,v 1.5 2002/05/16 17:24:06 harris41 Exp $
 #
 #
 # Copyright Michigan State University Board of Trustees
@@ -33,7 +33,7 @@
 
 package LONCAPA::Configuration;
 
-$VERSION = sprintf("%d.%02d", q$Revision: 1.4 $ =~ /(\d+)\.(\d+)/);
+$VERSION = sprintf("%d.%02d", q$Revision: 1.5 $ =~ /(\d+)\.(\d+)/);
 
 use strict;
 
@@ -43,7 +43,7 @@
 sub read_conf {
     my (@conf_files)=@_;
     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");
 	while (my $configline=<CONFIG>) {
 	    if ($configline =~ /^[^\#]*PerlSetVar/) {