[LON-CAPA-cvs] cvs: loncom(version_1_0_2) / loncapa_apache.conf

[albertel]

albertel		Tue Sep 16 14:28:16 2003 EDT

  Modified files:              (Branch: version_1_0_2)
    /loncom	loncapa_apache.conf 
  Log:
  - backport 1.61
  
  
Index: loncom/loncapa_apache.conf
diff -u loncom/loncapa_apache.conf:1.59 loncom/loncapa_apache.conf:1.59.2.1
--- loncom/loncapa_apache.conf:1.59	Tue Aug  5 08:52:22 2003
+++ loncom/loncapa_apache.conf	Tue Sep 16 14:28:16 2003
@@ -1,7 +1,7 @@
 ##
 ## loncapa_apache.conf -- Apache HTTP LON-CAPA configuration file
 ##
-## $Id: loncapa_apache.conf,v 1.59 2003/08/05 12:52:22 www Exp $
+## $Id: loncapa_apache.conf,v 1.59.2.1 2003/09/16 18:28:16 albertel Exp $
 ##
 
 #
@@ -793,6 +793,10 @@
 # ====================================== Include machine-specific configuration
 
 Include conf/loncapa.conf
+
+# ================================================= Include local configuration
+
+Include conf/loncapa_apache_local*.conf
 
 # ================================================== Initiate mod_perl starting