--- loncom/loncapa_apache.conf	2003/07/17 13:50:44	1.56
+++ loncom/loncapa_apache.conf	2003/12/10 00:32:55	1.66
@@ -1,7 +1,7 @@
 ##
 ## loncapa_apache.conf -- Apache HTTP LON-CAPA configuration file
 ##
-## $Id: loncapa_apache.conf,v 1.56 2003/07/17 13:50:44 www Exp $
+## $Id: loncapa_apache.conf,v 1.66 2003/12/10 00:32:55 www Exp $
 ##
 
 #
@@ -23,6 +23,9 @@ LoadModule perl_module       modules/lib
 AddModule mod_perl.c
 </IfDefine>
 
+<IfDefine MODPERL2>
+PerlSetVar	MODPERL2	1
+</IfDefine>
 # =============================================================== Miscellaneous
 
 ServerAdmin korte@lite.msu.edu
@@ -40,6 +43,9 @@ ScriptAlias /cgi-bin/ "/home/httpd/cgi-b
 # ------------------------------------------------------------- Access Handlers
 
 PerlTransHandler	Apache::lontrans
+<IfDefine MODPERL2>
+PerlCleanupHandler	Apache::lonnet::cleanenv
+</IfDefine>
 
 #PerlWarn On
 <LocationMatch "^/+res.*">
@@ -53,6 +59,7 @@ ErrorDocument	  500 /adm/errorhandler
 
 <LocationMatch "^/+userfiles.*">
 PerlAccessHandler       Apache::lontokacc
+PerlCleanupHandler	Apache::lontokacc::removefile
 </LocationMatch>
 
 <LocationMatch "^/+uploaded.*">
@@ -172,56 +179,59 @@ 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|\~|public|uploaded|adm).*\.meta$>
+<LocationMatch "^/+(res|\~|public|uploaded|adm).*\.meta$>
 SetHandler perl-script
 PerlHandler Apache::lonmeta
 </LocationMatch>
 
-<LocationMatch "^/(res|\~).*\.rights$>
+<LocationMatch "^/+(res|\~).*\.rights$>
 SetHandler perl-script
 PerlHandler Apache::lonrights
 </LocationMatch>
 
-<LocationMatch "^/(res|\~).*\.(xml|html|htm|xhtml|xhtm)$">
+<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>
 
-<LocationMatch "^/\~.*\.sty$">
+<LocationMatch "^/adm/wrapper/">
+PerlAccessHandler       Apache::lonacc
 SetHandler perl-script
-PerlHandler Apache::lonxml
+PerlHandler Apache::lonwrapper
+ErrorDocument     403 /adm/login
+ErrorDocument	  500 /adm/errorhandler
 </LocationMatch>
 
-<LocationMatch "^/adm/wrapper/">
+<LocationMatch "^/adm/localize/">
 PerlAccessHandler       Apache::lonacc
 SetHandler perl-script
-PerlHandler Apache::lonwrapper
+PerlHandler Apache::lonlocal
 ErrorDocument     403 /adm/login
 ErrorDocument	  500 /adm/errorhandler
 </LocationMatch>
@@ -400,7 +410,7 @@ ErrorDocument     406 /adm/unauthorized
 ErrorDocument	  500 /adm/errorhandler
 </Location>
 
-<LocationMatch "^/\~.*/$">
+<LocationMatch "^/+\~.*/$">
 PerlAccessHandler       Apache::loncacc
 SetHandler perl-script
 PerlHandler Apache::lonpubdir
@@ -508,6 +518,15 @@ 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
@@ -537,8 +556,8 @@ ErrorDocument	  500 /adm/errorhandler
 <Location /adm/coursedocs>
 PerlAccessHandler       Apache::lonacc
 SetHandler perl-script
-PerlCleanupHandler Apache::londocs::untiehash
 PerlHandler Apache::londocs
+ PerlCleanupHandler Apache::londocs::untiehash
 ErrorDocument     403 /adm/login
 ErrorDocument	  500 /adm/errorhandler
 </Location>
@@ -690,6 +709,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
@@ -763,6 +796,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
@@ -797,6 +831,10 @@ PerlSetVar       lonhttpdPort  8080
 
 Include conf/loncapa.conf
 
+# ================================================= Include local configuration
+
+Include conf/loncapa_apache_local*.conf
+
 # ================================================== Initiate mod_perl starting
 
 PerlRequire      conf/startup.pl