--- loncom/loncapa_apache.conf	2003/01/30 19:39:29	1.31
+++ loncom/loncapa_apache.conf	2004/01/15 20:22:47	1.71
@@ -1,13 +1,8 @@
 ##
 ## loncapa_apache.conf -- Apache HTTP LON-CAPA configuration file
 ##
-## $Id: loncapa_apache.conf,v 1.31 2003/01/30 19:39:29 bowersj2 Exp $
+## $Id: loncapa_apache.conf,v 1.71 2004/01/15 20:22:47 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,17 @@ Group www
 # ======================================================= Shared Object Modules
 
 LoadModule perl_module       modules/libperl.so
+<IfDefine !MODPERL2>
 AddModule mod_perl.c
+</IfDefine>
 
+<IfDefine MODPERL2>
+PerlSetVar	MODPERL2	1
+</IfDefine>
 # =============================================================== Miscellaneous
 
 ServerAdmin korte@lite.msu.edu
 ExtendedStatus On
-
 #
 # LON-CAPA Section (extensions to srm.conf name space servicing)
 #
@@ -44,7 +43,11 @@ ScriptAlias /cgi-bin/ "/home/httpd/cgi-b
 # ------------------------------------------------------------- Access Handlers
 
 PerlTransHandler	Apache::lontrans
+<IfDefine MODPERL2>
+PerlCleanupHandler	Apache::lonnet::cleanenv
+</IfDefine>
 
+#PerlWarn On
 <LocationMatch "^/+res.*">
 PerlAccessHandler       Apache::lonacc
 PerlHeaderParserHandler Apache::lonrep
@@ -56,6 +59,7 @@ ErrorDocument	  500 /adm/errorhandler
 
 <LocationMatch "^/+userfiles.*">
 PerlAccessHandler       Apache::lontokacc
+PerlCleanupHandler	Apache::lontokacc::removefile
 </LocationMatch>
 
 <LocationMatch "^/+uploaded.*">
@@ -64,7 +68,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 +76,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 +135,16 @@ 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
@@ -153,38 +179,51 @@ ErrorDocument	  500 /adm/errorhandler
 
 # --------------------------------------------- Resource Space Content Handlers
 
-<LocationMatch "^/res.*/$">
+<LocationMatch "^/+res.*/$">
 SetHandler perl-script
 PerlHandler Apache::lonindexer
 PerlCleanupHandler Apache::lonindexer::cleanup
 </LocationMatch>
 
-<LocationMatch "^/(res|\~).*\.tex$">
+<LocationMatch "^/+(res|\~).*\.tex$">
 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|\~).*\.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|\~).*\.(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>
 
-<LocationMatch "^/(res|\~).*\.(problem|exam|quiz|assess|survey|form|library)$">
+<LocationMatch "^/+(res|\~).*\.(problem|exam|quiz|assess|survey|form|library)$">
 SetHandler perl-script
 PerlHandler Apache::lonhomework
 </LocationMatch>
@@ -197,6 +236,14 @@ ErrorDocument     403 /adm/login
 ErrorDocument	  500 /adm/errorhandler
 </LocationMatch>
 
+<LocationMatch "^/adm/localize/">
+PerlAccessHandler       Apache::lonacc
+SetHandler perl-script
+PerlHandler Apache::lonlocal
+ErrorDocument     403 /adm/login
+ErrorDocument	  500 /adm/errorhandler
+</LocationMatch>
+
 # -------------------------------------------------------------- Admin Programs
 
 <Location /adm/randomlabel.png>
@@ -207,6 +254,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
@@ -224,6 +279,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/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
@@ -232,6 +303,14 @@ 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
@@ -328,6 +407,15 @@ ErrorDocument     406 /adm/roles
 ErrorDocument	  500 /adm/errorhandler
 </Location>
 
+<Location /adm/modifycourse>
+PerlAccessHandler       Apache::lonacc
+SetHandler perl-script
+PerlHandler Apache::lonmodifycourse
+ErrorDocument     403 /adm/login
+ErrorDocument     406 /adm/roles
+ErrorDocument     500 /adm/errorhandler
+</Location>
+
 <Location /adm/createuser>
 PerlAccessHandler       Apache::lonacc
 SetHandler perl-script
@@ -347,7 +435,7 @@ ErrorDocument     406 /adm/unauthorized
 ErrorDocument	  500 /adm/errorhandler
 </Location>
 
-<LocationMatch "^/\~.*/$">
+<LocationMatch "^/+\~.*/$">
 PerlAccessHandler       Apache::loncacc
 SetHandler perl-script
 PerlHandler Apache::lonpubdir
@@ -455,6 +543,24 @@ ErrorDocument     406 /adm/roles
 ErrorDocument	  500 /adm/errorhandler
 </Location>
 
+<Location /adm/populate>
+PerlAccessHandler       Apache::lonacc
+SetHandler perl-script
+PerlHandler Apache::lonpopulate
+ErrorDocument     403 /adm/login
+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
@@ -476,6 +582,7 @@ ErrorDocument	  500 /adm/errorhandler
 PerlAccessHandler       Apache::lonacc
 SetHandler perl-script
 PerlHandler Apache::londocs
+ PerlCleanupHandler Apache::londocs::untiehash
 ErrorDocument     403 /adm/login
 ErrorDocument	  500 /adm/errorhandler
 </Location>
@@ -550,7 +657,6 @@ 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
@@ -580,6 +686,7 @@ PerlHandler Apache::lonerrorhandler
 </Location>
 
 <LocationMatch "^/adm/help/.*\.hlp$">
+PerlAccessHandler	Apache::lonacc
 SetHandler perl-script
 PerlHandler Apache::lonhelp
 </LocationMatch>
@@ -593,6 +700,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
@@ -621,6 +735,20 @@ AuthUserFile /home/httpd/lonTabs/htpassw
 require user  reaper
 </Location>
 
+<Location /cgi-bin/takeoffline.pl>
+AuthName "Offline"
+AuthType Basic
+AuthUserFile /home/httpd/lonTabs/htpasswd
+require user  offline
+</Location>
+
+<Location /cgi-bin/takeonline.pl>
+AuthName "Offline"
+AuthType Basic
+AuthUserFile /home/httpd/lonTabs/htpasswd
+require user  offline
+</Location>
+
 <Location /adm/test>
 AuthName "LON-CAPA Network Administration"
 AuthType Basic
@@ -694,6 +822,7 @@ Options Indexes FollowSymLinks
 # ******** THESE "SHOULD" NEVER BE ALTERED BY THE USER ************************
 # ====================================== Internal Settings / Perl Configuration
 
+PerlSetVar	 lonVersion   '<!-- VERSION -->'
 PerlSetVar       lonIDsDir    /home/httpd/lonIDs
 PerlSetVar       lonTabDir    /home/httpd/lonTabs
 PerlSetVar       lonUsersDir  /home/httpd/lonUsers
@@ -705,7 +834,11 @@ 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
+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".
@@ -716,13 +849,23 @@ 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
 
 Include conf/loncapa.conf
 
+# ================================================= Include local configuration
+
+Include conf/loncapa_apache_local*.conf
+
 # ================================================== Initiate mod_perl starting
 
 PerlRequire      conf/startup.pl
+<IfDefine !MODPERL2>
 PerlFreshRestart On
+</IfDefine>