--- loncom/loncapa_apache.conf	2003/12/28 09:18:11	1.67
+++ loncom/loncapa_apache.conf	2004/05/31 20:24:11	1.81
@@ -1,7 +1,7 @@
 ##
 ## loncapa_apache.conf -- Apache HTTP LON-CAPA configuration file
 ##
-## $Id: loncapa_apache.conf,v 1.67 2003/12/28 09:18:11 raeburn Exp $
+## $Id: loncapa_apache.conf,v 1.81 2004/05/31 20:24:11 albertel Exp $
 ##
 
 #
@@ -57,17 +57,38 @@ ErrorDocument     406 /adm/roles
 ErrorDocument	  500 /adm/errorhandler
 </LocationMatch>
 
+<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::lonuploadedacc
+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
@@ -190,28 +211,37 @@ 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|\~|public|uploaded|adm).*\.meta$>
+<LocationMatch "^/+(res|\~|public|uploaded|adm).*\.meta$">
+SetHandler perl-script
+PerlHandler Apache::lonmeta
+</LocationMatch>
+
+<LocationMatch "^/adm/bombs/">
 SetHandler perl-script
+PerlAccessHandler Apache::lonacc
 PerlHandler Apache::lonmeta
 </LocationMatch>
 
-<LocationMatch "^/+(res|\~).*\.rights$>
+
+
+<LocationMatch "^/+(res|\~).*\.rights$">
 SetHandler perl-script
 PerlHandler Apache::lonrights
 </LocationMatch>
 
-<LocationMatch "^/+(res|\~).*\.(xml|html|htm|xhtml|xhtm|sty)$">
+<LocationMatch "^/+(uploaded|res|\~).*\.(xml|html|htm|xhtml|xhtm|sty)$">
 SetHandler perl-script
+PerlHandler Apache::londatecheck
 PerlHandler Apache::lonxml
 </LocationMatch>
 
@@ -246,6 +276,14 @@ 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
@@ -295,6 +333,14 @@ 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
@@ -488,6 +534,26 @@ 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
@@ -571,6 +637,14 @@ 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
@@ -670,6 +744,7 @@ PerlHandler Apache::lonerrorhandler
 </Location>
 
 <LocationMatch "^/adm/help/.*\.hlp$">
+PerlAccessHandler	Apache::lonacc
 SetHandler perl-script
 PerlHandler Apache::lonhelp
 </LocationMatch>
@@ -820,6 +895,8 @@ PerlSetVar       lonBrowsDet  netscape:m
 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".
@@ -835,6 +912,51 @@ PerlSetVar       lonSqlAccess   localhos
 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