--- loncom/loncapa.conf	2002/05/16 00:03:36	1.6
+++ loncom/loncapa.conf	2004/05/27 09:28:38	1.10
@@ -1,10 +1,8 @@
 ##
 ## loncapa.conf -- Apache HTTP LON-CAPA configuration file
 ##
-## $Id: loncapa.conf,v 1.6 2002/05/16 00:03:36 harris41 Exp $
+## $Id: loncapa.conf,v 1.10 2004/05/27 09:28:38 foxr Exp $
 ##
-## 5/12/2002 - Scott Harrison
-## 5/15/2002 - Scott Harrison
 
 # ======================================= Machine Specific / Perl Configuration
 #
@@ -30,6 +28,10 @@ PerlSetVar       lonDefDomain {[[[[lonDe
 
 PerlSetVar       lonLoadLim   {[[[[lonLoadLim]]]]}
 
+# User Load Limit ( 100% loadavg )
+
+PerlSetVar       lonUserLoadLim   {[[[[lonUserLoadLim]]]]}
+
 # Expiration for local copies and tokens in seconds
 
 PerlSetVar       lonExpire    {[[[[lonExpire]]]]}
@@ -37,3 +39,27 @@ PerlSetVar       lonExpire    {[[[[lonEx
 # Key to issue receipts
  
 PerlSetVar	 lonReceipt   {[[[[lonReceipt]]]]}
+
+#
+#   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]]]]}
+