--- loncom/loncapa_apache.conf	2003/01/10 21:31:03	1.26.2.1
+++ loncom/loncapa_apache.conf	2003/03/14 02:26:12	1.39
@@ -1,13 +1,8 @@
 ##
 ## loncapa_apache.conf -- Apache HTTP LON-CAPA configuration file
 ##
-## $Id: loncapa_apache.conf,v 1.26.2.1 2003/01/10 21:31:03 albertel Exp $
+## $Id: loncapa_apache.conf,v 1.39 2003/03/14 02:26:12 www 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)
@@ -179,6 +174,11 @@ SetHandler perl-script
 PerlHandler Apache::lonmeta
 </LocationMatch>
 
+<LocationMatch "^/(res|\~).*\.rights$>
+SetHandler perl-script
+PerlHandler Apache::lonrights
+</LocationMatch>
+
 <LocationMatch "^/(res|\~).*\.(xml|html|htm|xhtml|xhtm)$">
 SetHandler perl-script
 PerlHandler Apache::lonxml
@@ -224,6 +224,22 @@ 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/pickstudent>
+PerlAccessHandler       Apache::lonacc
+SetHandler perl-script
+PerlHandler Apache::lonpickstudent
+ErrorDocument     403 /adm/login
+ErrorDocument	  500 /adm/errorhandler
+</Location>
+
 <Location /adm/login>
 SetHandler perl-script
 PerlHandler Apache::lonlogin
@@ -261,6 +277,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
@@ -270,6 +287,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>
@@ -291,6 +309,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
@@ -456,6 +483,7 @@ ErrorDocument	  500 /adm/errorhandler
 <Location /adm/coursedocs>
 PerlAccessHandler       Apache::lonacc
 SetHandler perl-script
+PerlCleanupHandler Apache::coursedocs::untiehash
 PerlHandler Apache::londocs
 ErrorDocument     403 /adm/login
 ErrorDocument	  500 /adm/errorhandler
@@ -531,6 +559,7 @@ ErrorDocument	  500 /adm/errorhandler
 PerlAccessHandler       Apache::lonacc
 SetHandler perl-script
 PerlHandler Apache::lonnavmaps
+PerlCleanupHandler Apache::lonnavmaps::cleanup
 ErrorDocument     403 /adm/login
 ErrorDocument     406 /adm/roles
 ErrorDocument	  500 /adm/errorhandler
@@ -573,6 +602,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
@@ -685,6 +721,7 @@ PerlSetVar       lonSockDir   /home/http
 PerlSetVar       lonDocRoot   /home/httpd/html
 PerlSetVar       lonIncludes  /home/httpd/html/res/adm/includes
 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
 
 # -----------------------------------------------------------------------------
 # NOTE: lonSqlAccess key is the password for the MySQL user
@@ -696,6 +733,10 @@ 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
+
 
 
 # ====================================== Include machine-specific configuration