--- loncom/loncapa_apache.conf	2002/05/12 19:11:31	1.1
+++ loncom/loncapa_apache.conf	2002/05/23 19:02:16	1.5
@@ -1,7 +1,7 @@
 ##
 ## loncapa_apache.conf -- Apache HTTP LON-CAPA configuration file
 ##
-## $Id: loncapa_apache.conf,v 1.1 2002/05/12 19:11:31 harris41 Exp $
+## $Id: loncapa_apache.conf,v 1.5 2002/05/23 19:02:16 harris41 Exp $
 ##
 ## 1/11/2002 - Scott Harrison
 ## 2/19/2002 - Scott Harrison
@@ -12,7 +12,7 @@
 #
 # LON-CAPA Section (extensions to httpd.conf daemon configuration)
 #
-# ======================================================================== User
+# ================================================================ DocumentRoot
 
 DocumentRoot "/home/httpd/html"
 
@@ -37,6 +37,7 @@ ExtendedStatus On
 # ===================================================================== Aliases
 
 Alias /prtspool/ /home/httpd/prtspool/
+ScriptAlias /cgi-bin/ "/home/httpd/cgi-bin/"
 
 # ================================================================= Directories
 
@@ -565,6 +566,22 @@ PerlSetVar       lonDocRoot   /home/http
 PerlSetVar       lonIncludes  /home/httpd/html/res/adm/includes
 PerlSetVar       lonBrowsDet  netscape:mozilla:msie:mozilla\/(\d+\.\d+)\s:9999&explorer:msie:netscape:msie\s(\d+\.\d+)\;:9999&mozilla:mozilla\/[5-9]:msie:mozilla\/(\d+\.\d+)\s:9999&amaya:amaya:mozilla:V(\d+\.\d+)\s:1
 
+# -----------------------------------------------------------------------------
+# NOTE: lonSqlAccess key is the password for the MySQL user
+# www@localhost.  This value must always be "localhostkey".
+# The only security risk occurs when somebody logs in as 'www' on your system
+# (in which case you have much bigger problems than whether or not they
+# can access the non-authoritative loncapa database on your machine).
+
+PerlSetVar       lonSqlAccess   localhostkey
+
+# -----------------------------------------------------------------------------
+
+
+# ====================================== Include machine-specific configuration
+
+Include conf/loncapa.conf
+
 # ================================================== Initiate mod_perl starting
 
 PerlRequire      conf/startup.pl