[LON-CAPA-cvs] cvs: loncom / lonc lond lonsql

[harris41]

harris41		Mon Sep  9 10:04:02 2002 EDT

  Modified files:              
    /loncom	lonc lond lonsql 
  Log:
  loncapa_apache.conf should not be directly specified (and certainly not
  before loncapa.conf)
  
  
Index: loncom/lonc
diff -u loncom/lonc:1.41 loncom/lonc:1.42
--- loncom/lonc:1.41	Fri May 17 10:03:04 2002
+++ loncom/lonc	Mon Sep  9 10:04:02 2002
@@ -5,7 +5,7 @@
 # provides persistent TCP connections to the other servers in the network
 # through multiplexed domain sockets
 #
-# $Id: lonc,v 1.41 2002/05/17 14:03:04 matthew Exp $
+# $Id: lonc,v 1.42 2002/09/09 14:04:02 harris41 Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -76,9 +76,8 @@
 $SIG{__DIE__}=\&catchexception;
 
 # ---------------------------------- Read loncapa_apache.conf and loncapa.conf
-&status("Read loncapa_apache.conf and loncapa.conf");
-my $perlvarref=LONCAPA::Configuration::read_conf('loncapa_apache.conf',
-                                                 'loncapa.conf');
+&status("Read loncapa.conf and loncapa_apache.conf");
+my $perlvarref=LONCAPA::Configuration::read_conf('loncapa.conf');
 my %perlvar=%{$perlvarref};
 undef $perlvarref;
 
Index: loncom/lond
diff -u loncom/lond:1.94 loncom/lond:1.95
--- loncom/lond:1.94	Mon Sep  2 22:01:14 2002
+++ loncom/lond	Mon Sep  9 10:04:02 2002
@@ -2,7 +2,7 @@
 # The LearningOnline Network
 # lond "LON Daemon" Server (port "LOND" 5663)
 #
-# $Id: lond,v 1.94 2002/09/03 02:01:14 albertel Exp $
+# $Id: lond,v 1.95 2002/09/09 14:04:02 harris41 Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -107,9 +107,8 @@
 $SIG{__DIE__}=\&catchexception;
 
 # ---------------------------------- Read loncapa_apache.conf and loncapa.conf
-&status("Read loncapa_apache.conf and loncapa.conf");
-my $perlvarref=LONCAPA::Configuration::read_conf('loncapa_apache.conf',
-                                                 'loncapa.conf');
+&status("Read loncapa.conf and loncapa_apache.conf");
+my $perlvarref=LONCAPA::Configuration::read_conf('loncapa.conf');
 my %perlvar=%{$perlvarref};
 undef $perlvarref;
 
Index: loncom/lonsql
diff -u loncom/lonsql:1.52 loncom/lonsql:1.53
--- loncom/lonsql:1.52	Tue Aug 13 15:40:57 2002
+++ loncom/lonsql	Mon Sep  9 10:04:02 2002
@@ -3,7 +3,7 @@
 # The LearningOnline Network
 # lonsql - LON TCP-MySQL-Server Daemon for handling database requests.
 #
-# $Id: lonsql,v 1.52 2002/08/13 19:40:57 matthew Exp $
+# $Id: lonsql,v 1.53 2002/09/09 14:04:02 harris41 Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -152,8 +152,7 @@
 #
 # Read loncapa_apache.conf and loncapa.conf
 #
-my $perlvarref=LONCAPA::Configuration::read_conf('loncapa_apache.conf',
-                                                 'loncapa.conf');
+my $perlvarref=LONCAPA::Configuration::read_conf('loncapa.conf');
 my %perlvar=%{$perlvarref};
 #
 # Make sure that database can be accessed