--- loncom/loncapa_apache.conf	2002/07/22 20:35:05	1.9
+++ loncom/loncapa_apache.conf	2004/05/31 14:55:18	1.80
@@ -1,13 +1,8 @@
 ##
 ## loncapa_apache.conf -- Apache HTTP LON-CAPA configuration file
 ##
-## $Id: loncapa_apache.conf,v 1.9 2002/07/22 20:35:05 stredwic Exp $
+## $Id: loncapa_apache.conf,v 1.80 2004/05/31 14:55:18 albertel Exp $
 ##
-## 1/11/2002 - Scott Harrison
-## 2/19/2002 - Scott Harrison
-## 2/28/2002 - Scott Harrison
-## 3/2/2002 - Scott Harrison
-## 5/12/2002 - Scott Harrison
 
 #
 # LON-CAPA Section (extensions to httpd.conf daemon configuration)
@@ -24,13 +19,17 @@ Group www
 # ======================================================= Shared Object Modules
 
 LoadModule perl_module       modules/libperl.so
+<IfDefine !MODPERL2>
 AddModule mod_perl.c
+</IfDefine>
 
+<IfDefine MODPERL2>
+PerlSetVar	MODPERL2	1
+</IfDefine>
 # =============================================================== Miscellaneous
 
 ServerAdmin korte@lite.msu.edu
 ExtendedStatus On
-
 #
 # LON-CAPA Section (extensions to srm.conf name space servicing)
 #
@@ -43,7 +42,13 @@ ScriptAlias /cgi-bin/ "/home/httpd/cgi-b
 
 # ------------------------------------------------------------- Access Handlers
 
-<LocationMatch "^/res.*">
+PerlTransHandler	Apache::lontrans
+<IfDefine MODPERL2>
+PerlCleanupHandler	Apache::lonnet::cleanenv
+</IfDefine>
+
+#PerlWarn On
+<LocationMatch "^/+res.*">
 PerlAccessHandler       Apache::lonacc
 PerlHeaderParserHandler Apache::lonrep
 ErrorDocument     403 /adm/login
@@ -52,29 +57,122 @@ ErrorDocument     406 /adm/roles
 ErrorDocument	  500 /adm/errorhandler
 </LocationMatch>
 
-<LocationMatch "^/priv.*">
+<LocationMatch "^/+enc.*">
+PerlAccessHandler       Apache::lonenc
+ErrorDocument     403 /adm/login
+ErrorDocument     404 /adm/notfound.html
+ErrorDocument     406 /adm/roles
+ErrorDocument	  500 /adm/errorhandler
+</LocationMatch>
+
+<LocationMatch "^/+userfiles.*">
+PerlAccessHandler       Apache::lontokacc
+PerlCleanupHandler	Apache::lontokacc::removefile
+</LocationMatch>
+
+<LocationMatch "^/+uploaded.*">
+PerlAccessHandler	Apache::lonacc
+PerlHeaderParserHandler Apache::lonuploadrep
+ErrorDocument     403 /adm/login
+ErrorDocument     404 /adm/notfound.html
+ErrorDocument     406 /adm/roles
+ErrorDocument	  500 /adm/errorhandler
+</LocationMatch>
+
+<LocationMatch "^/+uploaded/.*\.page$">
+SetHandler perl-script
+PerlHandler Apache::lonpage
+</LocationMatch>
+
+<LocationMatch "^/+uploaded/.*\.sequence$">
+SetHandler perl-script
+PerlHandler Apache::lonsequence
+</LocationMatch>
+
+<LocationMatch "^/+public/.*/syllabus$">
+PerlAccessHandler	Apache::lonacc
+SetHandler              perl-script
+PerlHandler             Apache::lonsyllabus
+ErrorDocument     404 /adm/notfound.html
+ErrorDocument	  500 /adm/errorhandler
+</LocationMatch>
+
+<LocationMatch "^/adm/.*/aboutme$">
+PerlAccessHandler	Apache::lonacc
+SetHandler              perl-script
+PerlHandler             Apache::lonaboutme
+ErrorDocument     404 /adm/notfound.html
+ErrorDocument     406 /adm/notinit.html
+ErrorDocument	  500 /adm/errorhandler
+</LocationMatch>
+
+<LocationMatch "^/adm/.*/smppg$">
+PerlAccessHandler	Apache::lonacc
+SetHandler              perl-script
+PerlHandler             Apache::lonsimplepage
+ErrorDocument     404 /adm/notfound.html
+ErrorDocument     406 /adm/notinit.html
+ErrorDocument	  500 /adm/errorhandler
+</LocationMatch>
+
+<LocationMatch "^/adm/.*/bulletinboard$">
+PerlAccessHandler	Apache::lonacc
+SetHandler              perl-script
+PerlHandler             Apache::lonbulletin
+ErrorDocument     404 /adm/notfound.html
+ErrorDocument     406 /adm/notinit.html
+ErrorDocument	  500 /adm/errorhandler
+</LocationMatch>
+
+<LocationMatch "\.problem/smpedit$">
+PerlAccessHandler	Apache::lonacc
+SetHandler              perl-script
+PerlHandler             Apache::lonsimpleproblemedit
+ErrorDocument     404 /adm/notfound.html
+ErrorDocument     406 /adm/notinit.html
+ErrorDocument	  500 /adm/errorhandler
+</LocationMatch>
+
+<LocationMatch "^/+priv.*">
 PerlAccessHandler Apache::loncacc
 SetHandler        perl-script
 PerlHandler       Apache::lonconstruct
 ErrorDocument     403 /adm/login
 ErrorDocument     404 /adm/notfound.html
-ErrorDocument     406 /adm/unauthorized.html
+ErrorDocument     406 /adm/unauthorized
 ErrorDocument	  500 /adm/errorhandler
 </LocationMatch>
 
-<LocationMatch "^/raw.*">
+<LocationMatch "^/+raw.*">
 PerlAccessHandler Apache::lonracc
 </LocationMatch>
 
-<LocationMatch "^/\~.*">
+<LocationMatch "^/+\~.*">
 PerlAccessHandler Apache::loncacc
 ErrorDocument     403 /adm/login
 ErrorDocument     404 /adm/notfound.html
-ErrorDocument     406 /adm/unauthorized.html
+ErrorDocument     406 /adm/unauthorized
 ErrorDocument	  500 /adm/errorhandler
 AllowOverride None
 </LocationMatch>
 
+<LocationMatch "^/adm/helper/.*\.helper$">
+PerlAccessHandler Apache::lonacc
+SetHandler        perl-script
+PerlHandler       Apache::lonhelper
+ErrorDocument     403 /adm/login
+ErrorDocument     404 /adm/notfound.html
+ErrorDocument     406 /adm/unauthorized
+ErrorDocument     500 /adm/errorhandler
+</LocationMatch>
+
+<LocationMatch "/prtspool">
+PerlAccessHandler Apache::lonacc
+ErrorDocument     403 /adm/login
+ErrorDocument     404 /adm/notfound.html
+ErrorDocument     406 /adm/roles
+ErrorDocument	  500 /adm/errorhandler
+</LocationMatch>
 # ------------------------------------------------------------------------- RAT
 
 <LocationMatch "^/\~.*\.sequence$">
@@ -102,37 +200,51 @@ ErrorDocument	  500 /adm/errorhandler
 
 # --------------------------------------------- Resource Space Content Handlers
 
-<LocationMatch "^/res.*/$">
+<LocationMatch "^/+res.*/$">
 SetHandler perl-script
 PerlHandler Apache::lonindexer
+PerlCleanupHandler Apache::lonindexer::cleanup
 </LocationMatch>
 
-<LocationMatch "^/(res|\~).*\.tex$">
+<LocationMatch "^/+(res|\~).*\.tex$">
 SetHandler perl-script
 PerlHandler Apache::lontex
 </LocationMatch>
 
-<LocationMatch "^/res/.*\.page$>
+<LocationMatch "^/+res/.*\.page$">
 SetHandler perl-script
 PerlHandler Apache::lonpage
 </LocationMatch>
 
-<LocationMatch "^/res/.*\.sequence$>
+<LocationMatch "^/+res/.*\.sequence$">
 SetHandler perl-script
 PerlHandler Apache::lonsequence
 </LocationMatch>
 
-<LocationMatch "^/(res|\~).*\.meta$>
+<LocationMatch "^/+(res|\~|public|uploaded|adm).*\.meta$">
 SetHandler perl-script
 PerlHandler Apache::lonmeta
 </LocationMatch>
 
-<LocationMatch "^/(res|\~).*\.(xml|html|htm|xhtml|xhtm)$">
+<LocationMatch "^/adm/bombs/">
+SetHandler perl-script
+PerlAccessHandler Apache::lonacc
+PerlHandler Apache::lonmeta
+</LocationMatch>
+
+
+
+<LocationMatch "^/+(res|\~).*\.rights$">
+SetHandler perl-script
+PerlHandler Apache::lonrights
+</LocationMatch>
+
+<LocationMatch "^/+(uploaded|res|\~).*\.(xml|html|htm|xhtml|xhtm|sty)$">
 SetHandler perl-script
 PerlHandler Apache::lonxml
 </LocationMatch>
 
-<LocationMatch "^/(res|\~).*\.(problem|exam|quiz|assess|survey|form|library)$">
+<LocationMatch "^/+(res|\~).*\.(problem|exam|quiz|assess|survey|form|library)$">
 SetHandler perl-script
 PerlHandler Apache::lonhomework
 </LocationMatch>
@@ -145,13 +257,38 @@ ErrorDocument     403 /adm/login
 ErrorDocument	  500 /adm/errorhandler
 </LocationMatch>
 
+<LocationMatch "^/adm/localize/">
+PerlAccessHandler       Apache::lonacc
+SetHandler perl-script
+PerlHandler Apache::lonlocal
+ErrorDocument     403 /adm/login
+ErrorDocument	  500 /adm/errorhandler
+</LocationMatch>
+
 # -------------------------------------------------------------- Admin Programs
 
+<Location /adm/randomlabel.png>
+PerlAccessHandler       Apache::lonacc
+SetHandler perl-script
+PerlHandler Apache::randomlylabel
+ErrorDocument     403 /adm/login
+ErrorDocument	  500 /adm/errorhandler
+</Location>
+
+<Location /adm/imagechoice>
+PerlAccessHandler       Apache::lonacc
+SetHandler perl-script
+PerlHandler Apache::imagechoice
+ErrorDocument     403 /adm/login
+ErrorDocument	  500 /adm/errorhandler
+</Location>
+
 <Location /adm/statistics>
 PerlAccessHandler       Apache::lonacc
 SetHandler perl-script
 PerlHandler Apache::lonstatistics
 ErrorDocument     403 /adm/login
+ErrorDocument     413 /adm/overloaded.txt
 ErrorDocument	  500 /adm/errorhandler
 </Location>
 
@@ -163,6 +300,46 @@ ErrorDocument     403 /adm/login
 ErrorDocument	  500 /adm/errorhandler
 </Location>
 
+<Location /adm/menu>
+PerlAccessHandler       Apache::lonacc
+SetHandler perl-script
+PerlHandler Apache::lonmenu
+ErrorDocument     403 /adm/login
+ErrorDocument	  500 /adm/errorhandler
+</Location>
+
+<Location /adm/remote>
+PerlAccessHandler       Apache::lonacc
+SetHandler perl-script
+PerlHandler Apache::lonremote
+ErrorDocument     403 /adm/login
+ErrorDocument	  500 /adm/errorhandler
+</Location>
+
+<Location /adm/pickstudent>
+PerlAccessHandler       Apache::lonacc
+SetHandler perl-script
+PerlHandler Apache::lonpickstudent
+ErrorDocument     403 /adm/login
+ErrorDocument	  500 /adm/errorhandler
+</Location>
+
+<Location /adm/pickcourse>
+PerlAccessHandler       Apache::lonacc
+SetHandler perl-script
+PerlHandler Apache::lonpickcourse
+ErrorDocument     403 /adm/login
+ErrorDocument	  500 /adm/errorhandler
+</Location>
+
+<Location /adm/pickcode>
+PerlAccessHandler       Apache::lonacc
+SetHandler perl-script
+PerlHandler Apache::lonpickcode
+ErrorDocument     403 /adm/login
+ErrorDocument	  500 /adm/errorhandler
+</Location>
+
 <Location /adm/login>
 SetHandler perl-script
 PerlHandler Apache::lonlogin
@@ -200,6 +377,7 @@ ErrorDocument	  500 /adm/errorhandler
 PerlAccessHandler       Apache::lonacc
 SetHandler perl-script
 PerlHandler Apache::lonpageflip
+PerlCleanupHandler Apache::lonpageflip::cleanup
 ErrorDocument     406 /adm/roles
 ErrorDocument     403 /adm/login
 ErrorDocument	  500 /adm/errorhandler
@@ -209,6 +387,7 @@ ErrorDocument	  500 /adm/errorhandler
 PerlAccessHandler       Apache::lonacc
 SetHandler perl-script
 PerlHandler Apache::lonambiguous
+PerlCleanupHandler Apache::lonambiguous::cleanup
 ErrorDocument     403 /adm/login
 ErrorDocument	  500 /adm/errorhandler
 </Location>
@@ -230,6 +409,15 @@ ErrorDocument     406 /adm/roles
 ErrorDocument	  500 /adm/errorhandler
 </Location>
 
+<Location /adm/wizard>
+PerlAccessHandler       Apache::lonacc
+SetHandler perl-script
+PerlHandler Apache::lonwizard
+ErrorDocument     403 /adm/login
+ErrorDocument     406 /adm/roles
+ErrorDocument	  500 /adm/errorhandler
+</Location>
+
 <Location /adm/grades>
 PerlAccessHandler       Apache::lonacc
 SetHandler perl-script
@@ -248,6 +436,15 @@ ErrorDocument     406 /adm/roles
 ErrorDocument	  500 /adm/errorhandler
 </Location>
 
+<Location /adm/modifycourse>
+PerlAccessHandler       Apache::lonacc
+SetHandler perl-script
+PerlHandler Apache::lonmodifycourse
+ErrorDocument     403 /adm/login
+ErrorDocument     406 /adm/roles
+ErrorDocument     500 /adm/errorhandler
+</Location>
+
 <Location /adm/createuser>
 PerlAccessHandler       Apache::lonacc
 SetHandler perl-script
@@ -263,17 +460,17 @@ SetHandler perl-script
 PerlHandler Apache::lonpublisher
 ErrorDocument     403 /adm/login
 ErrorDocument     404 /adm/notfound.html
-ErrorDocument     406 /adm/unauthorized.html
+ErrorDocument     406 /adm/unauthorized
 ErrorDocument	  500 /adm/errorhandler
 </Location>
 
-<LocationMatch "^/\~.*/$">
+<LocationMatch "^/+\~.*/$">
 PerlAccessHandler       Apache::loncacc
 SetHandler perl-script
 PerlHandler Apache::lonpubdir
 ErrorDocument     403 /adm/login
 ErrorDocument     404 /adm/notfound.html
-ErrorDocument     406 /adm/unauthorized.html
+ErrorDocument     406 /adm/unauthorized
 ErrorDocument	  500 /adm/errorhandler
 </LocationMatch>
 
@@ -283,7 +480,16 @@ SetHandler perl-script
 PerlHandler Apache::lonpubdir
 ErrorDocument     403 /adm/login
 ErrorDocument     404 /adm/notfound.html
-ErrorDocument     406 /adm/unauthorized.html
+ErrorDocument     406 /adm/unauthorized
+ErrorDocument	  500 /adm/errorhandler
+</Location>
+
+<Location /adm/unauthorized>
+PerlAccessHandler       Apache::lonacc
+SetHandler perl-script
+PerlHandler Apache::lonunauthorized
+ErrorDocument     403 /adm/login
+ErrorDocument     404 /adm/notfound.html
 ErrorDocument	  500 /adm/errorhandler
 </Location>
 
@@ -293,7 +499,7 @@ SetHandler perl-script
 PerlHandler Apache::lonretrieve
 ErrorDocument     403 /adm/login
 ErrorDocument     404 /adm/notfound.html
-ErrorDocument     406 /adm/unauthorized.html
+ErrorDocument     406 /adm/unauthorized
 ErrorDocument	  500 /adm/errorhandler
 </Location>
 
@@ -303,7 +509,7 @@ SetHandler perl-script
 PerlHandler Apache::loncfile
 ErrorDocument     403 /adm/login
 ErrorDocument     404 /adm/notfound.html
-ErrorDocument     406 /adm/unauthorized.html
+ErrorDocument     406 /adm/unauthorized
 ErrorDocument	  500 /adm/errorhandler
 </Location>
 
@@ -313,7 +519,7 @@ SetHandler perl-script
 PerlHandler Apache::londiff
 ErrorDocument     403 /adm/login
 ErrorDocument     404 /adm/notfound.html
-ErrorDocument     406 /adm/unauthorized.html
+ErrorDocument     406 /adm/unauthorized
 ErrorDocument	  500 /adm/errorhandler
 </Location>
 
@@ -323,16 +529,37 @@ SetHandler perl-script
 PerlHandler Apache::lonupload
 ErrorDocument     403 /adm/login
 ErrorDocument     404 /adm/notfound.html
-ErrorDocument     406 /adm/unauthorized.html
+ErrorDocument     406 /adm/unauthorized
 ErrorDocument	  500 /adm/errorhandler
 </Location>
 
+<Location /adm/imsimport>
+PerlAccessHandler       Apache::lonacc
+SetHandler perl-script
+PerlHandler Apache::imsimport
+ErrorDocument     403 /adm/login
+ErrorDocument     404 /adm/notfound.html
+ErrorDocument     406 /adm/unauthorized
+ErrorDocument     500 /adm/errorhandler
+</Location>
+
+<Location /adm/testbank>
+PerlAccessHandler       Apache::lonacc
+SetHandler perl-script
+PerlHandler Apache::testbankimport
+ErrorDocument     403 /adm/login
+ErrorDocument     404 /adm/notfound.html
+ErrorDocument     406 /adm/unauthorized
+ErrorDocument     500 /adm/errorhandler
+</Location>
+
 <Location /adm/assesscalc>
 PerlAccessHandler       Apache::lonacc
 SetHandler perl-script
 PerlHandler Apache::lonspreadsheet
 ErrorDocument     403 /adm/login
 ErrorDocument     406 /adm/roles
+ErrorDocument     413 /adm/overloaded.txt
 ErrorDocument	  500 /adm/errorhandler
 </Location>
 
@@ -342,6 +569,7 @@ SetHandler perl-script
 PerlHandler Apache::lonspreadsheet
 ErrorDocument     403 /adm/login
 ErrorDocument     406 /adm/roles
+ErrorDocument     413 /adm/overloaded.txt
 ErrorDocument	  500 /adm/errorhandler
 </Location>
 
@@ -351,6 +579,7 @@ SetHandler perl-script
 PerlHandler Apache::lonspreadsheet
 ErrorDocument     403 /adm/login
 ErrorDocument     406 /adm/roles
+ErrorDocument     413 /adm/overloaded.txt
 ErrorDocument	  500 /adm/errorhandler
 </Location>
 
@@ -363,11 +592,30 @@ ErrorDocument     406 /adm/roles
 ErrorDocument	  500 /adm/errorhandler
 </Location>
 
+<Location /adm/populate>
+PerlAccessHandler       Apache::lonacc
+SetHandler perl-script
+PerlHandler Apache::lonpopulate
+ErrorDocument     403 /adm/login
+ErrorDocument     406 /adm/roles
+ErrorDocument     500 /adm/errorhandler
+</Location>
+
+<Location /adm/managekeys>
+PerlAccessHandler       Apache::lonacc
+SetHandler perl-script
+PerlHandler Apache::lonmanagekeys
+ErrorDocument     403 /adm/login
+ErrorDocument     406 /adm/roles
+ErrorDocument	  500 /adm/errorhandler
+</Location>
+
 <Location /adm/printout>
 PerlAccessHandler       Apache::lonacc
 SetHandler perl-script
 PerlHandler Apache::lonprintout
 ErrorDocument     403 /adm/login
+ErrorDocument     413 /adm/overloaded.txt
 ErrorDocument	  500 /adm/errorhandler
 </Location>
 
@@ -379,6 +627,46 @@ ErrorDocument     403 /adm/login
 ErrorDocument	  500 /adm/errorhandler
 </Location>
 
+<Location /adm/coursedocs>
+PerlAccessHandler       Apache::lonacc
+SetHandler perl-script
+PerlHandler Apache::londocs
+ PerlCleanupHandler Apache::londocs::untiehash
+ErrorDocument     403 /adm/login
+ErrorDocument	  500 /adm/errorhandler
+</Location>
+
+<Location /adm/imsimportdocs>
+PerlAccessHandler       Apache::lonacc
+SetHandler perl-script
+PerlHandler Apache::imsimportdocs
+ErrorDocument     403 /adm/login
+ErrorDocument     500 /adm/errorhandler
+</Location>
+
+<Location /adm/announcements>
+PerlAccessHandler       Apache::lonacc
+SetHandler perl-script
+PerlHandler Apache::lonannounce
+ErrorDocument     403 /adm/login
+ErrorDocument	  500 /adm/errorhandler
+</Location>
+
+<Location /adm/chat>
+PerlAccessHandler       Apache::lonacc
+SetHandler perl-script
+PerlHandler Apache::lonchat
+ErrorDocument	  500 /adm/errorhandler
+</Location>
+
+<Location /adm/chatfetch>
+PerlAccessHandler       Apache::lonacc
+SetHandler perl-script
+PerlHandler Apache::lonchatfetch
+ErrorDocument     413 /adm/overloaded.txt
+ErrorDocument	  500 /adm/errorhandler
+</Location>
+
 <Location /adm/evaluate>
 PerlAccessHandler       Apache::lonacc
 SetHandler perl-script
@@ -416,7 +704,9 @@ ErrorDocument	  500 /adm/errorhandler
 PerlAccessHandler       Apache::lonacc
 SetHandler perl-script
 PerlHandler Apache::lonsearchcat
+PerlCleanupHandler Apache::lonsearchcat::cleanup
 ErrorDocument     403 /adm/login
+ErrorDocument     413 /adm/overloaded.txt
 ErrorDocument	  500 /adm/errorhandler
 </Location>
 
@@ -429,10 +719,20 @@ ErrorDocument     406 /adm/roles
 ErrorDocument	  500 /adm/errorhandler
 </Location>
 
+<Location /adm/quickgrades>
+PerlAccessHandler       Apache::lonacc
+SetHandler perl-script
+PerlHandler Apache::lonquickgrades
+ErrorDocument     403 /adm/login
+ErrorDocument     406 /adm/roles
+ErrorDocument     500 /adm/errorhandler
+</Location>
+
 <Location /adm/groupsort>
 PerlAccessHandler	Apache::lonacc
 SetHandler perl-script
 PerlHandler Apache::groupsort
+PerlCleanupHandler Apache::groupsort::cleanup
 ErrorDocument     403 /adm/login
 ErrorDocument	  500 /adm/errorhandler
 </Location>
@@ -443,6 +743,7 @@ PerlHandler Apache::lonerrorhandler
 </Location>
 
 <LocationMatch "^/adm/help/.*\.hlp$">
+PerlAccessHandler	Apache::lonacc
 SetHandler perl-script
 PerlHandler Apache::lonhelp
 </LocationMatch>
@@ -456,6 +757,13 @@ AuthUserFile /home/httpd/lonTabs/htpassw
 require user lonadm
 </Location>
 
+<Location /cgi-bin/userstatus.pl>
+AuthName "LON-CAPA Network Administration"
+AuthType Basic
+AuthUserFile /home/httpd/lonTabs/htpasswd
+require user lonadm
+</Location>
+
 <Location /cgi-bin/lonversions.pl>
 AuthName "LON-CAPA Network Administration"
 AuthType Basic
@@ -477,6 +785,27 @@ AuthUserFile /home/httpd/lonTabs/htpassw
 require user lonadm
 </Location>
 
+<Location /cgi-bin/metadata_harvest.pl>
+AuthName "harvest"
+AuthType Basic
+AuthUserFile /home/httpd/lonTabs/htpasswd
+require user  reaper
+</Location>
+
+<Location /cgi-bin/takeoffline.pl>
+AuthName "Offline"
+AuthType Basic
+AuthUserFile /home/httpd/lonTabs/htpasswd
+require user  offline
+</Location>
+
+<Location /cgi-bin/takeonline.pl>
+AuthName "Offline"
+AuthType Basic
+AuthUserFile /home/httpd/lonTabs/htpasswd
+require user  offline
+</Location>
+
 <Location /adm/test>
 AuthName "LON-CAPA Network Administration"
 AuthType Basic
@@ -550,6 +879,7 @@ Options Indexes FollowSymLinks
 # ******** THESE "SHOULD" NEVER BE ALTERED BY THE USER ************************
 # ====================================== Internal Settings / Perl Configuration
 
+PerlSetVar	 lonVersion   '<!-- VERSION -->'
 PerlSetVar       lonIDsDir    /home/httpd/lonIDs
 PerlSetVar       lonTabDir    /home/httpd/lonTabs
 PerlSetVar       lonUsersDir  /home/httpd/lonUsers
@@ -560,8 +890,12 @@ PerlSetVar       lonDaemons   /home/http
 PerlSetVar       lonSockDir   /home/httpd/sockets
 PerlSetVar       lonDocRoot   /home/httpd/html
 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
-
+PerlSetVar       lonBrowsDet  netscape:mozilla:msie:mozilla\/(\d+\.\d+)\s:9999:9999&explorer:msie:netscape:msie\s(\d+\.\d+)\;:9999:9999&mozilla:mozilla\/[5-9]:msie:mozilla\/(\d+\.\d+)\s:9999:1&amaya:amaya:mozilla:V(\d+\.\d+)\s:1:1
+PerlSetVar       lonTextBrowsers opera:windows\s+ce:lynx
+PerlSetVar       lonScansDir  /home/httpd/scantron
+PerlSetVar       lonScriptTimeout 10
+PerlSetVar	 BugzillaHost	http://bugs.lon-capa.org/
+PerlSetVar	 FAQHost	http://help.lon-capa.org/
 # -----------------------------------------------------------------------------
 # NOTE: lonSqlAccess key is the password for the MySQL user
 # www@localhost.  This value must always be "localhostkey".
@@ -572,13 +906,68 @@ PerlSetVar       lonBrowsDet  netscape:m
 PerlSetVar       lonSqlAccess   localhostkey
 
 # -----------------------------------------------------------------------------
+# lonttpdPort is the port used by the lightweight graphics httpd server
+# not the main Apache server
+PerlSetVar       lonhttpdPort  8080
+
+
+#   Parameters used by secure lond/lonc
+
+#
+#   Secure lond/lonc require ssl certificate and private
+#   key files to function correctly.  The certificate
+#   files need not be terribly secure, but the private key files
+#   should be set up so that only www (the lonc/lond effective user)
+#   can read them.
+# 
+#   The definition below is the full path to the directory that
+#   contains the certificate and key files:
+#
+PerlSetVar lonCertificateDirectory /home/httpd/lonCerts
+
+#
+#  Secure lond/lonc require two certificates and a private host key.
+#  The certificates required are that of the lonCAPA certificate authority
+#  and the certificate that authority issued to this host.
+#  lonnetCertificateAuthority is the name of the file that contains the
+#                            lonCAPA certificate authority's certificate.
+#  lonnetCertificate is the name of the file that contains the certificate
+#                    issued to the host by the certificate authority.
+#  Both of these variables are names of files assumed to be in 
+#  lonCertificateDirectory:
+
+PerlSetVar lonnetCertificateAuthority loncapaCA.pem
+PerlSetVar lonnetCertificate          lonhostcert.pem
+
+#
+#  To generate the request for a certificate, and to negotiate the
+#  initial ssl connection, the host requires a private key.  This key
+#  is created at lonCAPA install time.  Did we mention above that it
+#  should be set so that only www can read it?  The variale below
+#  is the name of the file relative to lonnetCertificateDirectory
+#  that has the host's private key.  Did we remember to tell you to
+#  keep the permissions on that file set to rw-------  (0600)?
+#  
+
+PerlSetVar lonnetPrivateKey         lonKey.pem
+
+# Did we mention that the file described above must have
+# permissions really locked down so that it can't be stolen?
+
+
 
 
 # ====================================== Include machine-specific configuration
 
 Include conf/loncapa.conf
 
+# ================================================= Include local configuration
+
+Include conf/loncapa_apache_local*.conf
+
 # ================================================== Initiate mod_perl starting
 
 PerlRequire      conf/startup.pl
+<IfDefine !MODPERL2>
 PerlFreshRestart On
+</IfDefine>