[LON-CAPA-cvs] cvs: loncom /cgi clusterstatus.pl metadata_keywords.pl ping.pl

Mon, 09 Sep 2002 14:18:56 -0000

harris41		Mon Sep  9 10:18:56 2002 EDT

  Modified files:              
    /loncom/cgi	clusterstatus.pl metadata_keywords.pl ping.pl 
  Log:
  remove access.conf; loncapa.conf is read and BY DEFAULT loncapa_apache.conf
  is always read (AT THE END)
  
  
Index: loncom/cgi/clusterstatus.pl
diff -u loncom/cgi/clusterstatus.pl:1.3 loncom/cgi/clusterstatus.pl:1.4

--- loncom/cgi/clusterstatus.pl:1.3	Sat May 11 17:29:42 2002
+++ loncom/cgi/clusterstatus.pl	Mon Sep  9 10:18:56 2002
@@ -54,8 +54,8 @@
  
 print "Content-type: text/html\n\n".
       "<html><body bgcolor=#FFFFFF>\n";
-# ------------------------------------------- Read access.conf and loncapa.conf
-my $perlvarref=LONCAPA::Configuration::read_conf('access.conf','loncapa.conf');
+# -------------------- Read loncapa.conf (and by default, loncapa_apache.conf).
+my $perlvarref=LONCAPA::Configuration::read_conf('loncapa.conf');
 my %perlvar=%{$perlvarref};
 undef $perlvarref; # remove since sensitive and not needed
 delete $perlvar{'lonReceipt'}; # remove since sensitive and not needed
Index: loncom/cgi/metadata_keywords.pl
diff -u loncom/cgi/metadata_keywords.pl:1.3 loncom/cgi/metadata_keywords.pl:1.4
--- loncom/cgi/metadata_keywords.pl:1.3	Sat May 11 17:31:00 2002
+++ loncom/cgi/metadata_keywords.pl	Mon Sep  9 10:18:56 2002
@@ -58,7 +58,9 @@
 
 # --- Make sure that database can be accessed and that this is a library server
 # library server test
-my $perlvarref=LONCAPA::Configuration::read_conf('access.conf','loncapa.conf');
+
+# By default, loncapa_apache.conf is also read by the read_conf subroutine.
+my $perlvarref=LONCAPA::Configuration::read_conf('loncapa.conf');
 my %perlvar=%{$perlvarref};
 undef($perlvarref);
 
Index: loncom/cgi/ping.pl
diff -u loncom/cgi/ping.pl:1.2 loncom/cgi/ping.pl:1.3
--- loncom/cgi/ping.pl:1.2	Sat May 11 17:31:41 2002
+++ loncom/cgi/ping.pl	Mon Sep  9 10:18:56 2002
@@ -28,8 +28,8 @@
 }
 
 
-# ------------------------------------------- Read access.conf and loncapa.conf
-my $perlvarref=LONCAPA::Configuration::read_conf('access.conf','loncapa.conf');
+# --------------------- Read loncapa.conf (and by default loncapa_apache.conf).
+my $perlvarref=LONCAPA::Configuration::read_conf('loncapa.conf');
 my %perlvar=%{$perlvarref};
 undef $perlvarref; # remove since sensitive and not needed
 delete $perlvar{'lonReceipt'}; # remove since sensitive and not needed



