--- loncom/loncapa.conf	2002/01/11 16:42:14	1.1
+++ loncom/loncapa.conf	2004/05/27 09:28:38	1.10
@@ -1,451 +1,65 @@
 ##
 ## loncapa.conf -- Apache HTTP LON-CAPA configuration file
 ##
-## $Id: loncapa.conf,v 1.1 2002/01/11 16:42:14 harris41 Exp $
+## $Id: loncapa.conf,v 1.10 2004/05/27 09:28:38 foxr Exp $
 ##
-## 1/11/2002 - Scott Harrison
 
+# ======================================= Machine Specific / Perl Configuration
 #
-# LON-CAPA Section (extensions to srm.conf name space servicing)
-#
-# ================================================================= Directories
+# ------------------------ The variable values are also read and shared by lond
+
+# LON-internal HostID of this machine
+
+PerlSetVar       lonHostID    {[[[[lonHostID]]]]}
+ 
+# Role of this machine: library, access
+
+PerlSetVar       lonRole      {[[[[lonRole]]]]}
+
+# Server Administration
+
+PerlSetVar       lonAdmEMail  {[[[[lonAdmEMail]]]]}
+
+# Default domain
+
+PerlSetVar       lonDefDomain {[[[[lonDefDomain]]]]}
+
+# Load Limit ( 100% loadavg )
 
-# ------------------------------------------------------------- Access Handlers
+PerlSetVar       lonLoadLim   {[[[[lonLoadLim]]]]}
+
+# User Load Limit ( 100% loadavg )
+
+PerlSetVar       lonUserLoadLim   {[[[[lonUserLoadLim]]]]}
+
+# Expiration for local copies and tokens in seconds
+
+PerlSetVar       lonExpire    {[[[[lonExpire]]]]}
+
+# Key to issue receipts
+ 
+PerlSetVar	 lonReceipt   {[[[[lonReceipt]]]]}
+
+#
+#   The variables below control the behavior of secure lond:
+#
+#
 
-<LocationMatch "^/res.*">
-PerlAccessHandler       Apache::lonacc
-PerlHeaderParserHandler Apache::lonrep
-ErrorDocument     403 /adm/login
-ErrorDocument     404 /adm/notfound.html
-ErrorDocument     406 /adm/roles
-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	  500 /adm/errorhandler
-</LocationMatch>
-
-<LocationMatch "^/raw.*">
-PerlAccessHandler Apache::lonracc
-</LocationMatch>
-
-<LocationMatch "^/\~.*">
-PerlAccessHandler Apache::loncacc
-ErrorDocument     403 /adm/login
-ErrorDocument     404 /adm/notfound.html
-ErrorDocument     406 /adm/unauthorized.html
-ErrorDocument	  500 /adm/errorhandler
-AllowOverride None
-</LocationMatch>
-
-# ------------------------------------------------------------------------- RAT
-
-<LocationMatch "^/\~.*\.sequence$">
-SetHandler perl-script
-PerlHandler Apache::lonratedt
-</LocationMatch>
-
-<LocationMatch "^/\~.*\.page$">
-SetHandler perl-script
-PerlHandler Apache::lonratedt
-</LocationMatch>
-
-<LocationMatch "^/\~.*\/ratserver$">
-SetHandler perl-script
-PerlHandler Apache::lonratsrv
-</LocationMatch>
-
-<Location /adm/ratparms>
-PerlAccessHandler       Apache::lonacc
-SetHandler perl-script
-PerlHandler Apache::lonratparms
-ErrorDocument     403 /adm/login
-ErrorDocument	  500 /adm/errorhandler
-</Location>
-
-# --------------------------------------------- Resource Space Content Handlers
-
-<LocationMatch "^/res.*/$">
-SetHandler perl-script
-PerlHandler Apache::lonindexer
-</LocationMatch>
-
-<LocationMatch "^/(res|\~).*\.tex$">
-SetHandler perl-script
-PerlHandler Apache::lontex
-</LocationMatch>
-
-<LocationMatch "^/res/.*\.page$>
-SetHandler perl-script
-PerlHandler Apache::lonpage
-</LocationMatch>
-
-<LocationMatch "^/res/.*\.sequence$>
-SetHandler perl-script
-PerlHandler Apache::lonsequence
-</LocationMatch>
-
-<LocationMatch "^/res/.*\.meta$>
-SetHandler perl-script
-PerlHandler Apache::lonmeta
-</LocationMatch>
-
-<LocationMatch "^/(res|\~).*\.(xml|html|htm|xhtml|xhtm)$">
-SetHandler perl-script
-PerlHandler Apache::lonxml
-</LocationMatch>
-
-<LocationMatch "^/(res|\~).*\.(problem|exam|quiz|assess|survey|form|library)$">
-SetHandler perl-script
-PerlHandler Apache::lonhomework
-</LocationMatch>
-
-<LocationMatch "^/adm/wrapper/">
-PerlAccessHandler       Apache::lonacc
-SetHandler perl-script
-PerlHandler Apache::lonwrapper
-ErrorDocument     403 /adm/login
-ErrorDocument	  500 /adm/errorhandler
-</LocationMatch>
-
-# -------------------------------------------------------------- Admin Programs
-
-<Location /adm/statistics>
-PerlAccessHandler       Apache::lonacc
-SetHandler perl-script
-PerlHandler Apache::lonstatistics
-ErrorDocument     403 /adm/login
-ErrorDocument	  500 /adm/errorhandler
-</Location>
-
-<Location /adm/roles>
-PerlAccessHandler       Apache::lonacc
-SetHandler perl-script
-PerlHandler Apache::lonroles
-ErrorDocument     403 /adm/login
-ErrorDocument	  500 /adm/errorhandler
-</Location>
-
-<Location /adm/login>
-SetHandler perl-script
-PerlHandler Apache::lonlogin
-</Location>
-
-<Location /adm/logout>
-PerlAccessHandler       Apache::lonacc
-SetHandler perl-script
-PerlHandler Apache::lonlogout
-ErrorDocument     403 /adm/login
-</Location>
-
-<Location /adm/authenticate>
-SetHandler perl-script
-PerlHandler Apache::lonauth
-</Location>
-
-<Location /adm/annotations>
-PerlAccessHandler       Apache::lonacc
-SetHandler perl-script
-PerlHandler Apache::admannotations
-ErrorDocument     403 /adm/login
-ErrorDocument	  500 /adm/errorhandler
-</Location>
-
-<Location /adm/bookmarks>
-PerlAccessHandler       Apache::lonacc
-SetHandler perl-script
-PerlHandler Apache::admbookmarks
-ErrorDocument     403 /adm/login
-ErrorDocument	  500 /adm/errorhandler
-</Location>
-
-<Location /adm/flip>
-PerlAccessHandler       Apache::lonacc
-SetHandler perl-script
-PerlHandler Apache::lonpageflip
-ErrorDocument     406 /adm/roles
-ErrorDocument     403 /adm/login
-ErrorDocument	  500 /adm/errorhandler
-</Location>
-
-<Location /adm/ambiguous>
-PerlAccessHandler       Apache::lonacc
-SetHandler perl-script
-PerlHandler Apache::lonambiguous
-ErrorDocument     403 /adm/login
-ErrorDocument	  500 /adm/errorhandler
-</Location>
-
-<Location /adm/email>
-PerlAccessHandler       Apache::lonacc
-SetHandler perl-script
-PerlHandler Apache::lonmsg
-ErrorDocument     403 /adm/login
-ErrorDocument	  500 /adm/errorhandler
-</Location>
-
-<Location /adm/parmset>
-PerlAccessHandler       Apache::lonacc
-SetHandler perl-script
-PerlHandler Apache::lonparmset
-ErrorDocument     403 /adm/login
-ErrorDocument     406 /adm/roles
-ErrorDocument	  500 /adm/errorhandler
-</Location>
-
-<Location /adm/grades>
-PerlAccessHandler       Apache::lonacc
-SetHandler perl-script
-PerlHandler Apache::grades
-ErrorDocument     403 /adm/login
-ErrorDocument     406 /adm/roles
-ErrorDocument	  500 /adm/errorhandler
-</Location>
-
-<Location /adm/createcourse>
-PerlAccessHandler       Apache::lonacc
-SetHandler perl-script
-PerlHandler Apache::loncreatecourse
-ErrorDocument     403 /adm/login
-ErrorDocument     406 /adm/roles
-ErrorDocument	  500 /adm/errorhandler
-</Location>
-
-<Location /adm/createuser>
-PerlAccessHandler       Apache::lonacc
-SetHandler perl-script
-PerlHandler Apache::loncreateuser
-ErrorDocument     403 /adm/login
-ErrorDocument     406 /adm/roles
-ErrorDocument	  500 /adm/errorhandler
-</Location>
-
-<Location /adm/publish>
-PerlAccessHandler       Apache::lonacc
-SetHandler perl-script
-PerlHandler Apache::lonpublisher
-ErrorDocument     403 /adm/login
-ErrorDocument     404 /adm/notfound.html
-ErrorDocument     406 /adm/unauthorized.html
-ErrorDocument	  500 /adm/errorhandler
-</Location>
-
-<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	  500 /adm/errorhandler
-</LocationMatch>
-
-<Location /adm/pubdir>
-PerlAccessHandler       Apache::lonacc
-SetHandler perl-script
-PerlHandler Apache::lonpubdir
-ErrorDocument     403 /adm/login
-ErrorDocument     404 /adm/notfound.html
-ErrorDocument     406 /adm/unauthorized.html
-ErrorDocument	  500 /adm/errorhandler
-</Location>
-
-<Location /adm/retrieve>
-PerlAccessHandler       Apache::lonacc
-SetHandler perl-script
-PerlHandler Apache::lonretrieve
-ErrorDocument     403 /adm/login
-ErrorDocument     404 /adm/notfound.html
-ErrorDocument     406 /adm/unauthorized.html
-ErrorDocument	  500 /adm/errorhandler
-</Location>
-
-<Location /adm/cfile>
-PerlAccessHandler       Apache::lonacc
-SetHandler perl-script
-PerlHandler Apache::loncfile
-ErrorDocument     403 /adm/login
-ErrorDocument     404 /adm/notfound.html
-ErrorDocument     406 /adm/unauthorized.html
-ErrorDocument	  500 /adm/errorhandler
-</Location>
-
-<Location /adm/diff>
-PerlAccessHandler       Apache::lonacc
-SetHandler perl-script
-PerlHandler Apache::londiff
-ErrorDocument     403 /adm/login
-ErrorDocument     404 /adm/notfound.html
-ErrorDocument     406 /adm/unauthorized.html
-ErrorDocument	  500 /adm/errorhandler
-</Location>
-
-<Location /adm/upload>
-PerlAccessHandler       Apache::lonacc
-SetHandler perl-script
-PerlHandler Apache::lonupload
-ErrorDocument     403 /adm/login
-ErrorDocument     404 /adm/notfound.html
-ErrorDocument     406 /adm/unauthorized.html
-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	  500 /adm/errorhandler
-</Location>
-
-<Location /adm/studentcalc>
-PerlAccessHandler       Apache::lonacc
-SetHandler perl-script
-PerlHandler Apache::lonspreadsheet
-ErrorDocument     403 /adm/login
-ErrorDocument     406 /adm/roles
-ErrorDocument	  500 /adm/errorhandler
-</Location>
-
-<Location /adm/classcalc>
-PerlAccessHandler       Apache::lonacc
-SetHandler perl-script
-PerlHandler Apache::lonspreadsheet
-ErrorDocument     403 /adm/login
-ErrorDocument     406 /adm/roles
-ErrorDocument	  500 /adm/errorhandler
-</Location>
-
-<Location /adm/chart>
-PerlAccessHandler       Apache::lonacc
-SetHandler perl-script
-PerlHandler Apache::lonchart
-ErrorDocument     403 /adm/login
-ErrorDocument     406 /adm/roles
-ErrorDocument	  500 /adm/errorhandler
-</Location>
-
-<Location /adm/dropadd>
-PerlAccessHandler       Apache::lonacc
-SetHandler perl-script
-PerlHandler Apache::londropadd
-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	  500 /adm/errorhandler
-</Location>
-
-<Location /adm/feedback>
-PerlAccessHandler       Apache::lonacc
-SetHandler perl-script
-PerlHandler Apache::lonfeedback
-ErrorDocument     403 /adm/login
-ErrorDocument	  500 /adm/errorhandler
-</Location>
-
-<Location /adm/evaluate>
-PerlAccessHandler       Apache::lonacc
-SetHandler perl-script
-PerlHandler Apache::lonevaluate
-ErrorDocument     403 /adm/login
-ErrorDocument	  500 /adm/errorhandler
-</Location>
-
-<Location /adm/preferences>
-PerlAccessHandler       Apache::lonacc
-SetHandler perl-script
-PerlHandler Apache::lonpreferences
-ErrorDocument     403 /adm/login
-ErrorDocument	  500 /adm/errorhandler
-</Location>
-
-<Location /adm/assignments>
-PerlAccessHandler       Apache::lonacc
-SetHandler perl-script
-PerlHandler Apache::lonassignments
-ErrorDocument     403 /adm/login
-ErrorDocument     406 /adm/roles
-ErrorDocument	  500 /adm/errorhandler
-</Location>
-
-<Location /adm/communicate>
-PerlAccessHandler       Apache::lonacc
-SetHandler perl-script
-PerlHandler Apache::loncommunicate
-ErrorDocument     403 /adm/login
-ErrorDocument	  500 /adm/errorhandler
-</Location>
-
-<Location /adm/searchcat>
-PerlAccessHandler       Apache::lonacc
-SetHandler perl-script
-PerlHandler Apache::lonsearchcat
-ErrorDocument     403 /adm/login
-ErrorDocument	  500 /adm/errorhandler
-</Location>
-
-<Location /adm/navmaps>
-PerlAccessHandler       Apache::lonacc
-SetHandler perl-script
-PerlHandler Apache::lonnavmaps
-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
-ErrorDocument     403 /adm/login
-ErrorDocument	  500 /adm/errorhandler
-</Location>
-
-<Location /adm/errorhandler>
-SetHandler perl-script
-PerlHandler Apache::lonerrorhandler
-</Location>
-
-# ------------------------------------------------- Backdoor Adm Tests/Programs
-
-<Location /cgi-bin/loncron.pl>
-AuthName "LON Network Synchronization Handler"
-AuthType Basic
-AuthUserFile /home/httpd/lonTabs/htpasswd
-require user lonadm
-</Location>
-
-<Location /cgi-bin/metadata_keywords.pl>
-AuthName "LON Keyword Handler"
-AuthType Basic
-AuthUserFile /home/httpd/lonTabs/htpasswd
-require user lonadm
-</Location>
-
-<Location /adm/test>
-AuthName "LON Test Handler"
-AuthType Basic
-AuthUserFile /home/httpd/lonTabs/htpasswd
-require user lonadm
-SetHandler perl-script
-PerlAccessHandler Apache::lonacc
-PerlHandler Apache::lontest
-</Location>
+#  londAllowInsecure allows lond to fall back to insecure connections
+#  in the event its peer is not yet updated to secure lonc.
+#  If you are certain all the systems you are communicating with
+#  are using secure lonc, uncomment the first definition and
+#  comment the second.
+
+# PerlSetVar londAllowInsecure {[[[[0]]]]}
+PerlSetVar londAllowInsecure {[[[[1]]]]}
+
+# loncAllowInsecure allows lonc to fall back to negotiating an insecure
+# connection with lond in the event the peer is not yet a secure lond.
+# If you are certain that all systems you are communicating with 
+# are using secure lond, uncomment the next line and comment the
+# second:
 
-# ------------------------------------------------------- Shutting down a child
+# PerlSetVar loncAllowInsecure {[[[[0]]]]}
+PerlSetVar   loncAllowInsecure {[[[[1]]]]}
 
-PerlChildExitHandler Apache::lonnet::goodbye