--- loncom/loncapa_apache.conf	2002/10/10 20:46:51	1.21
+++ loncom/loncapa_apache.conf	2003/07/17 15:50:46	1.57
@@ -1,13 +1,8 @@
 ##
 ## loncapa_apache.conf -- Apache HTTP LON-CAPA configuration file
 ##
-## $Id: loncapa_apache.conf,v 1.21 2002/10/10 20:46:51 www Exp $
+## $Id: loncapa_apache.conf,v 1.57 2003/07/17 15:50:46 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)
@@ -24,13 +19,14 @@ Group www
 # ======================================================= Shared Object Modules
 
 LoadModule perl_module       modules/libperl.so
+<IfDefine !MODPERL2>
 AddModule mod_perl.c
+</IfDefine>
 
 # =============================================================== Miscellaneous
 
 ServerAdmin korte@lite.msu.edu
 ExtendedStatus On
-
 #
 # LON-CAPA Section (extensions to srm.conf name space servicing)
 #
@@ -45,6 +41,7 @@ ScriptAlias /cgi-bin/ "/home/httpd/cgi-b
 
 PerlTransHandler	Apache::lontrans
 
+#PerlWarn On
 <LocationMatch "^/+res.*">
 PerlAccessHandler       Apache::lonacc
 PerlHeaderParserHandler Apache::lonrep
@@ -64,7 +61,7 @@ ErrorDocument     404 /adm/notfound.html
 ErrorDocument	  500 /adm/errorhandler
 </LocationMatch>
 
-<LocationMatch "^/+public/.*/syllabus">
+<LocationMatch "^/+public/.*/syllabus$">
 PerlAccessHandler	Apache::lonacc
 SetHandler              perl-script
 PerlHandler             Apache::lonsyllabus
@@ -72,27 +69,39 @@ ErrorDocument     404 /adm/notfound.html
 ErrorDocument	  500 /adm/errorhandler
 </LocationMatch>
 
-<LocationMatch "^/adm/.*/aboutme">
+<LocationMatch "^/adm/.*/aboutme$">
 PerlAccessHandler	Apache::lonacc
 SetHandler              perl-script
 PerlHandler             Apache::lonaboutme
 ErrorDocument     404 /adm/notfound.html
+ErrorDocument     406 /adm/notinit.html
 ErrorDocument	  500 /adm/errorhandler
 </LocationMatch>
 
-<LocationMatch "^/adm/.*/smppg">
+<LocationMatch "^/adm/.*/smppg$">
 PerlAccessHandler	Apache::lonacc
 SetHandler              perl-script
 PerlHandler             Apache::lonsimplepage
 ErrorDocument     404 /adm/notfound.html
+ErrorDocument     406 /adm/notinit.html
 ErrorDocument	  500 /adm/errorhandler
 </LocationMatch>
 
-<LocationMatch "^/adm/.*/bulletinboard">
+<LocationMatch "^/adm/.*/bulletinboard$">
 PerlAccessHandler	Apache::lonacc
 SetHandler              perl-script
 PerlHandler             Apache::lonbulletin
 ErrorDocument     404 /adm/notfound.html
+ErrorDocument     406 /adm/notinit.html
+ErrorDocument	  500 /adm/errorhandler
+</LocationMatch>
+
+<LocationMatch "\.problem/smpedit$">
+PerlAccessHandler	Apache::lonacc
+SetHandler              perl-script
+PerlHandler             Apache::lonsimpleproblemedit
+ErrorDocument     404 /adm/notfound.html
+ErrorDocument     406 /adm/notinit.html
 ErrorDocument	  500 /adm/errorhandler
 </LocationMatch>
 
@@ -119,6 +128,23 @@ ErrorDocument	  500 /adm/errorhandler
 AllowOverride None
 </LocationMatch>
 
+<LocationMatch "^/adm/helper/.*\.helper$">
+PerlAccessHandler Apache::lonacc
+SetHandler        perl-script
+PerlHandler       Apache::lonhelper
+ErrorDocument     403 /adm/login
+ErrorDocument     404 /adm/notfound.html
+ErrorDocument     406 /adm/unauthorized
+ErrorDocument     500 /adm/errorhandler
+</LocationMatch>
+
+<LocationMatch "/prtspool">
+PerlAccessHandler Apache::lonacc
+ErrorDocument     403 /adm/login
+ErrorDocument     404 /adm/notfound.html
+ErrorDocument     406 /adm/roles
+ErrorDocument	  500 /adm/errorhandler
+</LocationMatch>
 # ------------------------------------------------------------------------- RAT
 
 <LocationMatch "^/\~.*\.sequence$">
@@ -149,6 +175,7 @@ ErrorDocument	  500 /adm/errorhandler
 <LocationMatch "^/res.*/$">
 SetHandler perl-script
 PerlHandler Apache::lonindexer
+PerlCleanupHandler Apache::lonindexer::cleanup
 </LocationMatch>
 
 <LocationMatch "^/(res|\~).*\.tex$">
@@ -166,12 +193,17 @@ SetHandler perl-script
 PerlHandler Apache::lonsequence
 </LocationMatch>
 
-<LocationMatch "^/(res|\~).*\.meta$>
+<LocationMatch "^/(res|\~|public|uploaded|adm).*\.meta$>
 SetHandler perl-script
 PerlHandler Apache::lonmeta
 </LocationMatch>
 
-<LocationMatch "^/(res|\~).*\.(xml|html|htm|xhtml|xhtm)$">
+<LocationMatch "^/(res|\~).*\.rights$>
+SetHandler perl-script
+PerlHandler Apache::lonrights
+</LocationMatch>
+
+<LocationMatch "^/(res|\~).*\.(xml|html|htm|xhtml|xhtm|sty)$">
 SetHandler perl-script
 PerlHandler Apache::lonxml
 </LocationMatch>
@@ -191,6 +223,14 @@ ErrorDocument	  500 /adm/errorhandler
 
 # -------------------------------------------------------------- Admin Programs
 
+<Location /adm/randomlabel.png>
+PerlAccessHandler       Apache::lonacc
+SetHandler perl-script
+PerlHandler Apache::randomlylabel
+ErrorDocument     403 /adm/login
+ErrorDocument	  500 /adm/errorhandler
+</Location>
+
 <Location /adm/statistics>
 PerlAccessHandler       Apache::lonacc
 SetHandler perl-script
@@ -208,6 +248,38 @@ 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/remote>
+PerlAccessHandler       Apache::lonacc
+SetHandler perl-script
+PerlHandler Apache::lonremote
+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/pickcourse>
+PerlAccessHandler       Apache::lonacc
+SetHandler perl-script
+PerlHandler Apache::lonpickcourse
+ErrorDocument     403 /adm/login
+ErrorDocument	  500 /adm/errorhandler
+</Location>
+
 <Location /adm/login>
 SetHandler perl-script
 PerlHandler Apache::lonlogin
@@ -245,6 +317,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
@@ -254,6 +327,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>
@@ -275,6 +349,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
@@ -420,6 +503,15 @@ ErrorDocument     406 /adm/roles
 ErrorDocument	  500 /adm/errorhandler
 </Location>
 
+<Location /adm/managekeys>
+PerlAccessHandler       Apache::lonacc
+SetHandler perl-script
+PerlHandler Apache::lonmanagekeys
+ErrorDocument     403 /adm/login
+ErrorDocument     406 /adm/roles
+ErrorDocument	  500 /adm/errorhandler
+</Location>
+
 <Location /adm/printout>
 PerlAccessHandler       Apache::lonacc
 SetHandler perl-script
@@ -440,6 +532,7 @@ ErrorDocument	  500 /adm/errorhandler
 <Location /adm/coursedocs>
 PerlAccessHandler       Apache::lonacc
 SetHandler perl-script
+PerlCleanupHandler Apache::londocs::untiehash
 PerlHandler Apache::londocs
 ErrorDocument     403 /adm/login
 ErrorDocument	  500 /adm/errorhandler
@@ -505,6 +598,7 @@ ErrorDocument	  500 /adm/errorhandler
 PerlAccessHandler       Apache::lonacc
 SetHandler perl-script
 PerlHandler Apache::lonsearchcat
+PerlCleanupHandler Apache::lonsearchcat::cleanup
 ErrorDocument     403 /adm/login
 ErrorDocument     413 /adm/overloaded.txt
 ErrorDocument	  500 /adm/errorhandler
@@ -519,10 +613,20 @@ ErrorDocument     406 /adm/roles
 ErrorDocument	  500 /adm/errorhandler
 </Location>
 
+<Location /adm/quickgrades>
+PerlAccessHandler       Apache::lonacc
+SetHandler perl-script
+PerlHandler Apache::lonquickgrades
+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
+PerlCleanupHandler Apache::groupsort::cleanup
 ErrorDocument     403 /adm/login
 ErrorDocument	  500 /adm/errorhandler
 </Location>
@@ -546,6 +650,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
@@ -567,6 +678,13 @@ AuthUserFile /home/httpd/lonTabs/htpassw
 require user lonadm
 </Location>
 
+<Location /cgi-bin/metadata_harvest.pl>
+AuthName "harvest"
+AuthType Basic
+AuthUserFile /home/httpd/lonTabs/htpasswd
+require user  reaper
+</Location>
+
 <Location /adm/test>
 AuthName "LON-CAPA Network Administration"
 AuthType Basic
@@ -650,8 +768,10 @@ PerlSetVar       lonDaemons   /home/http
 PerlSetVar       lonSockDir   /home/httpd/sockets
 PerlSetVar       lonDocRoot   /home/httpd/html
 PerlSetVar       lonIncludes  /home/httpd/html/res/adm/includes
-PerlSetVar       lonBrowsDet  netscape:mozilla:msie:mozilla\/(\d+\.\d+)\s:9999&explorer:msie:netscape:msie\s(\d+\.\d+)\;:9999&mozilla:mozilla\/[5-9]:msie:mozilla\/(\d+\.\d+)\s:9999&amaya:amaya:mozilla:V(\d+\.\d+)\s:1
-
+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
+PerlSetVar       lonScansDir  /home/httpd/scantron
+PerlSetVar       lonScriptTimeout 10
 # -----------------------------------------------------------------------------
 # NOTE: lonSqlAccess key is the password for the MySQL user
 # www@localhost.  This value must always be "localhostkey".
@@ -662,6 +782,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
@@ -671,4 +795,6 @@ Include conf/loncapa.conf
 # ================================================== Initiate mod_perl starting
 
 PerlRequire      conf/startup.pl
+<IfDefine !MODPERL2>
 PerlFreshRestart On
+</IfDefine>