--- loncom/loncapa_apache.conf	2006/06/26 20:23:28	1.142
+++ loncom/loncapa_apache.conf	2008/05/13 15:06:14	1.175
@@ -1,7 +1,7 @@
 ##
 ## loncapa_apache.conf -- Apache HTTP LON-CAPA configuration file
 ##
-## $Id: loncapa_apache.conf,v 1.142 2006/06/26 20:23:28 albertel Exp $
+## $Id: loncapa_apache.conf,v 1.175 2008/05/13 15:06:14 www Exp $
 ##
 
 #
@@ -35,6 +35,7 @@ ExtendedStatus On
 #
 # ===================================================================== Aliases
 
+Alias /zipspool/ /home/httpd/zipspool/
 Alias /prtspool/ /home/httpd/prtspool/
 ScriptAlias /cgi-bin/ "/home/httpd/cgi-bin/"
 
@@ -103,6 +104,7 @@ PerlCleanupHandler	Apache::lonacc::clean
 AuthType LONCAPA
 Require valid-user
 PerlAuthzHandler	Apache::lonacc
+PerlHandler Apache::londatecheck
 PerlHeaderParserHandler Apache::lonuploadrep
 ErrorDocument     403 /adm/login
 ErrorDocument     404 /adm/notfound.html
@@ -120,7 +122,9 @@ ErrorDocument	  500 /adm/errorhandler
 </LocationMatch>
 
 <LocationMatch "^/+uploaded/.*/.*/internal/.*">
-PerlAuthzHandler	Apache::lonuploadedacc
+PerlAuthenHandler	Apache::lonuploadedacc
+PerlAuthzHandler	Apache::lonuploadedacc::skip_phase
+PerlAccessHandler	Apache::lonuploadedacc::skip_phase
 </LocationMatch>
 
 <LocationMatch "^/+uploaded/.*/.*/portfolio/.*">
@@ -180,26 +184,28 @@ ErrorDocument     406 /adm/notinit.html
 ErrorDocument	  500 /adm/errorhandler
 </LocationMatch>
 
-<LocationMatch "^/adm/.*/smppg$">
+<LocationMatch "^/adm/.*/aboutme/portfolio$">
+PerlAccessHandler       Apache::publiccheck
 AuthType LONCAPA
 Require valid-user
 PerlAuthzHandler	Apache::lonacc
 SetHandler              perl-script
-PerlHandler             Apache::lonsimplepage
+PerlHandler             Apache::lonaboutme
 ErrorDocument     404 /adm/notfound.html
 ErrorDocument     406 /adm/notinit.html
 ErrorDocument	  500 /adm/errorhandler
 </LocationMatch>
 
-<LocationMatch "^/adm/.*/grppg$">
+<LocationMatch "^/adm/.*/smppg$">
 AuthType LONCAPA
 Require valid-user
-PerlAuthzHandler       Apache::lonacc
+PerlAuthzHandler	Apache::lonacc
 SetHandler              perl-script
+PerlHandler             Apache::londatecheck
 PerlHandler             Apache::lonsimplepage
 ErrorDocument     404 /adm/notfound.html
 ErrorDocument     406 /adm/notinit.html
-ErrorDocument     500 /adm/errorhandler
+ErrorDocument	  500 /adm/errorhandler
 </LocationMatch>
 
 <LocationMatch "^/adm/.*/bulletinboard$">
@@ -249,13 +255,11 @@ ErrorDocument     403 /adm/login
 ErrorDocument     404 /adm/notfound.html
 ErrorDocument     406 /adm/unauthorized
 ErrorDocument	  500 /adm/errorhandler
-AllowOverride None
 </LocationMatch>
 
 <LocationMatch "^/adm/helper/.*\.helper$">
 AuthType LONCAPA
 Require valid-user
-PerlAccessHandler Apache::publiccheck
 PerlAuthzHandler  Apache::lonacc
 SetHandler        perl-script
 PerlHandler       Apache::lonhelper
@@ -275,6 +279,17 @@ ErrorDocument     406 /adm/roles
 ErrorDocument     413 /adm/overloaded.txt
 ErrorDocument	  500 /adm/errorhandler
 </LocationMatch>
+
+<LocationMatch "/zipspool">
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler Apache::lonacc
+ErrorDocument     403 /adm/login
+ErrorDocument     404 /adm/notfound.html
+ErrorDocument     406 /adm/roles
+ErrorDocument     413 /adm/overloaded.txt
+ErrorDocument	  500 /adm/errorhandler
+</LocationMatch>
 # ------------------------------------------------------------------------- RAT
 
 <LocationMatch "^/\~.*\.sequence$">
@@ -368,6 +383,7 @@ PerlHandler Apache::lonhomework
 AuthType LONCAPA
 Require valid-user
 PerlAuthzHandler       Apache::lonacc
+PerlHandler Apache::londatecheck
 SetHandler perl-script
 PerlHandler Apache::lonwrapper
 ErrorDocument     403 /adm/login
@@ -447,6 +463,7 @@ PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
 PerlHandler Apache::lonroles
 ErrorDocument     403 /adm/login
+ErrorDocument     409 /adm/preferences?action=lockwarning
 ErrorDocument	  500 /adm/errorhandler
 </Location>
 
@@ -505,6 +522,26 @@ SetHandler perl-script
 PerlHandler Apache::lonlogin
 </Location>
 
+<Location /adm/restrictedaccess>
+PerlAccessHandler      Apache::publiccheck
+AuthType LONCAPA
+Require valid-user
+SetHandler perl-script
+PerlAuthzHandler       Apache::lonacc
+PerlHandler Apache::restrictedaccess
+ErrorDocument	  500 /adm/errorhandler
+</Location>
+
+<Location /adm/blockedaccess>
+PerlAccessHandler      Apache::publiccheck
+AuthType LONCAPA
+Require valid-user
+SetHandler perl-script
+PerlAuthzHandler       Apache::lonacc
+PerlHandler Apache::blockedaccess
+ErrorDocument     500 /adm/errorhandler
+</Location>
+
 <Location /adm/logout>
 AuthType LONCAPA
 Require valid-user
@@ -512,6 +549,8 @@ PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
 PerlHandler Apache::lonlogout
 ErrorDocument     403 /adm/login
+ErrorDocument     409 /adm/preferences?action=lockwarning
+ErrorDocument	  500 /adm/errorhandler
 </Location>
 
 <Location /adm/switchserver>
@@ -521,6 +560,7 @@ PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
 PerlHandler Apache::switchserver
 ErrorDocument     403 /adm/login
+ErrorDocument	  500 /adm/errorhandler
 </Location>
 
 <Location /adm/authenticate>
@@ -674,6 +714,17 @@ ErrorDocument     406 /adm/roles
 ErrorDocument     500 /adm/errorhandler
 </Location>
 
+<Location /adm/domainprefs>
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
+SetHandler perl-script
+PerlHandler Apache::domainprefs
+ErrorDocument     403 /adm/login
+ErrorDocument     406 /adm/roles
+ErrorDocument     500 /adm/errorhandler
+</Location>
+
 <Location /adm/createuser>
 AuthType LONCAPA
 Require valid-user
@@ -885,6 +936,28 @@ ErrorDocument     406 /adm/roles
 ErrorDocument     500 /adm/errorhandler
 </Location>
 
+<Location /adm/groupboards>
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
+SetHandler perl-script
+PerlHandler Apache::groupboards
+ErrorDocument     403 /adm/login
+ErrorDocument     406 /adm/roles
+ErrorDocument     500 /adm/errorhandler
+</Location>
+
+<Location /adm/grouproster>
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
+SetHandler perl-script
+PerlHandler Apache::grouproster
+ErrorDocument     403 /adm/login
+ErrorDocument     406 /adm/roles
+ErrorDocument     500 /adm/errorhandler
+</Location>
+
 <Location /adm/whatsnew>
 AuthType LONCAPA
 Require valid-user
@@ -1048,7 +1121,7 @@ AuthType LONCAPA
 Require valid-user
 PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
-PerlHandler Apache::lonnavmaps
+PerlHandler Apache::lonnavdisplay
 ErrorDocument     403 /adm/login
 ErrorDocument     406 /adm/roles
 ErrorDocument	  500 /adm/errorhandler
@@ -1085,9 +1158,11 @@ PerlHandler Apache::lonerrorhandler
 <LocationMatch "^/adm/help/.*\.hlp$">
 AuthType LONCAPA
 Require valid-user
+PerlAccessHandler      Apache::publiccheck
 PerlAuthzHandler	Apache::lonacc
 SetHandler perl-script
 PerlHandler Apache::lonhelp
+ErrorDocument	  500 /adm/errorhandler
 </LocationMatch>
 
 <LocationMatch "^/adm/helpmenu">
@@ -1096,6 +1171,7 @@ Require valid-user
 PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
 PerlHandler Apache::lonhelpmenu
+ErrorDocument	  500 /adm/errorhandler
 </LocationMatch>
 
 <LocationMatch "^/adm/support">
@@ -1104,16 +1180,49 @@ Require valid-user
 PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
 PerlHandler Apache::lonsupportreq
+ErrorDocument	  500 /adm/errorhandler
 </LocationMatch>
 
 <LocationMatch "^/adm/helpdesk">
 SetHandler perl-script
 PerlHandler Apache::lonsupportreq
+ErrorDocument	  500 /adm/errorhandler
 </LocationMatch>
 
 <LocationMatch "^/adm/css">
 SetHandler perl-script
 PerlHandler Apache::loncss
+ErrorDocument	  500 /adm/errorhandler
+</LocationMatch>
+
+<LocationMatch "^/adm/coursecatalog">
+SetHandler perl-script
+PerlHandler Apache::coursecatalog
+ErrorDocument	  500 /adm/errorhandler
+</LocationMatch>
+
+<LocationMatch "^/adm/resetpw">
+SetHandler perl-script
+PerlHandler Apache::resetpw
+ErrorDocument     500 /adm/errorhandler
+</LocationMatch>
+
+<LocationMatch "^/adm/selfenroll">
+SetHandler perl-script
+PerlHandler Apache::selfenroll
+ErrorDocument     500 /adm/errorhandler
+</LocationMatch>
+
+<LocationMatch "^/adm/createaccount">
+SetHandler perl-script
+PerlHandler Apache::createaccount
+ErrorDocument     500 /adm/errorhandler
+</LocationMatch>
+
+<LocationMatch "^/adm/dns">
+SetHandler perl-script
+PerlHandler Apache::londns
+ErrorDocument     500 /adm/errorhandler
 </LocationMatch>
 
 # ------------------------------------------------- Backdoor Adm Tests/Programs
@@ -1198,6 +1307,26 @@ PerlChildExitHandler Apache::lonacc::goo
 <Directory />
 Options None
 AllowOverride None
+order deny,allow
+deny from all
+</Directory>
+
+# Allow uploaded files to be served
+
+<Directory "/home/httpd/lonUsers">
+Options Includes FollowSymLinks
+AllowOverride None
+order allow,deny
+allow from all
+</Directory>
+ 
+# Allow construction space files to be served
+
+<Directory "/home/*/public_html/" >
+Options Includes FollowSymLinks
+AllowOverride
+order allow,deny
+allow from all
 </Directory>
 
 # Yes to symbolic links and server-side includes
@@ -1213,7 +1342,27 @@ allow from all
 
 <Directory /home/httpd/cgi-bin>
 AllowOverride None
-Options ExecCGI
+Options ExecCGI FollowSymLinks
+order allow,deny
+allow from all
+</Directory>
+
+# Allow serving of files in prtspool
+
+<Directory "/home/httpd/prtspool/">
+Options Includes FollowSymLinks
+AllowOverride None
+order allow,deny
+allow from all
+</Directory>
+
+# Allow serving of files in zipspool
+
+<Directory "/home/httpd/zipspool/">
+Options Includes FollowSymLinks
+AllowOverride None
+order allow,deny
+allow from all
 </Directory>
 
 # ============================================================= Access Handlers
@@ -1256,10 +1405,13 @@ PerlSetVar       londPort     5663
 PerlSetVar       lonSysEMail  korte@lite.msu.edu
 PerlSetVar       lonDaemons   /home/httpd/perl
 PerlSetVar       lonSockDir   /home/httpd/sockets
+PerlSetVar       lonSockCreate   /home/httpd/sockets/common
 PerlSetVar       lonDocRoot   /home/httpd/html
 PerlSetVar       lonPrtDir    /home/httpd/prtspool
 PerlSetVar       lonIncludes  /home/httpd/html/res/adm/includes
-# & sepeareted list of : seperated fileds inorder of
+PerlSetVar       lonZipDir    /home/httpd/zipspool
+PerlSetVar       lonFontsDir     /home/httpd/html/adm/fonts
+# & separated list of : separated fields in order of
 # - internal name to call it, 
 # - regexp that it should match (done case-insensitively)
 # - regexp that is should not match (done case-insensitively)