--- loncom/loncapa_apache.conf 2010/09/12 22:47:04 1.190.4.1 +++ loncom/loncapa_apache.conf 2010/03/18 13:16:06 1.195 @@ -1,7 +1,7 @@ ## ## loncapa_apache.conf -- Apache HTTP LON-CAPA configuration file ## -## $Id: loncapa_apache.conf,v 1.190.4.1 2010/09/12 22:47:04 raeburn Exp $ +## $Id: loncapa_apache.conf,v 1.195 2010/03/18 13:16:06 raeburn Exp $ ## # @@ -55,6 +55,12 @@ PerlSetVar lonOtherAuthen no PerlAuthenHandler 'sub { return OK }' +# Send proper expires header to avoid unnecessary HTTP request for static content + + ExpiresActive On + ExpiresDefault "access plus 12 hours" + + AuthType LONCAPA @@ -99,17 +105,24 @@ SetHandler perl-script PerlHandler Apache::portfolio + +AuthType LONCAPA +Require valid-user +PerlAuthzHandler Apache::lonacc +SetHandler perl-script +PerlHandler Apache::lonpdfupload +ErrorDocument 403 /adm/login +ErrorDocument 404 /adm/notfound.html +ErrorDocument 406 /adm/roles +ErrorDocument 500 /adm/errorhandler + + PerlAccessHandler Apache::lontokacc PerlCleanupHandler Apache::lontokacc::removefile PerlCleanupHandler Apache::lonacc::cleanup - -SetHandler perl-script -PerlHandler Apache::lonpdfupload - - AuthType LONCAPA Require valid-user @@ -497,16 +510,6 @@ ErrorDocument 403 /adm/login ErrorDocument 500 /adm/errorhandler - -AuthType LONCAPA -Require valid-user -PerlAuthzHandler Apache::lonacc -SetHandler perl-script -PerlHandler Apache::lonremote -ErrorDocument 403 /adm/login -ErrorDocument 500 /adm/errorhandler - - AuthType LONCAPA Require valid-user @@ -1279,7 +1282,6 @@ ErrorDocument 500 /adm/errorhandler SetHandler perl-script PerlHandler Apache::coursecatalog -PerlAccessHandler Apache::publiccheck ErrorDocument 500 /adm/errorhandler @@ -1533,7 +1535,8 @@ PerlSetVar SSLCAFile /usr/share/ssl/l PerlSetVar SSLEmail certificate@lon-capa.org #------------------------------------------------------------------------- -PerlSetVar AnonymousSalt + + # ====================================== Include machine-specific configuration