--- loncom/loncapa.conf	2002/05/12 19:12:01	1.5
+++ loncom/loncapa.conf	2004/05/27 09:28:38	1.10
@@ -1,44 +1,65 @@
 ##
 ## loncapa.conf -- Apache HTTP LON-CAPA configuration file
 ##
-## $Id: loncapa.conf,v 1.5 2002/05/12 19:12:01 harris41 Exp $
+## $Id: loncapa.conf,v 1.10 2004/05/27 09:28:38 foxr Exp $
 ##
-## 5/12/2002 - Scott Harrison
 
-# **** DISABLED TO STAY COMPATIBLE WITH LON-CAPA AND ACCESS.CONF FOR NOW ******
 # ======================================= Machine Specific / Perl Configuration
 #
 # ------------------------ The variable values are also read and shared by lond
 
 # LON-internal HostID of this machine
 
-# PerlSetVar       lonHostID    {[[[[lonHostID]]]]}
+PerlSetVar       lonHostID    {[[[[lonHostID]]]]}
  
 # Role of this machine: library, access
 
-# PerlSetVar       lonRole      {[[[[lonRole]]]]}
+PerlSetVar       lonRole      {[[[[lonRole]]]]}
 
 # Server Administration
 
-# PerlSetVar       lonAdmEMail  {[[[[lonAdmEMail]]]]}
+PerlSetVar       lonAdmEMail  {[[[[lonAdmEMail]]]]}
 
 # Default domain
 
-# PerlSetVar       lonDefDomain {[[[[lonDefDomain]]]]}
+PerlSetVar       lonDefDomain {[[[[lonDefDomain]]]]}
 
 # Load Limit ( 100% loadavg )
 
-# PerlSetVar       lonLoadLim   {[[[[lonLoadLim]]]]}
+PerlSetVar       lonLoadLim   {[[[[lonLoadLim]]]]}
+
+# User Load Limit ( 100% loadavg )
+
+PerlSetVar       lonUserLoadLim   {[[[[lonUserLoadLim]]]]}
 
 # Expiration for local copies and tokens in seconds
 
-# PerlSetVar       lonExpire    {[[[[lonExpire]]]]}
+PerlSetVar       lonExpire    {[[[[lonExpire]]]]}
 
 # Key to issue receipts
  
-# PerlSetVar	 lonReceipt   {[[[[lonReceipt]]]]}
+PerlSetVar	 lonReceipt   {[[[[lonReceipt]]]]}
 
-# Key to handle SQL access
- 
-# PerlSetVar	 lonSqlAccess   {[[[[lonSqlAccess]]]]}
+#
+#   The variables below control the behavior of secure lond:
+#
+#
+
+#  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:
+
+# PerlSetVar loncAllowInsecure {[[[[0]]]]}
+PerlSetVar   loncAllowInsecure {[[[[1]]]]}