--- loncom/loncapa_apache.conf 2011/12/25 20:41:59 1.207 +++ loncom/loncapa_apache.conf 2012/05/26 14:53:53 1.215.2.2 @@ -1,7 +1,7 @@ ## ## loncapa_apache.conf -- Apache HTTP LON-CAPA configuration file ## -## $Id: loncapa_apache.conf,v 1.207 2011/12/25 20:41:59 raeburn Exp $ +## $Id: loncapa_apache.conf,v 1.215.2.2 2012/05/26 14:53:53 raeburn Exp $ ## # @@ -38,7 +38,11 @@ ExtendedStatus On Alias /zipspool/ /home/httpd/zipspool/ Alias /prtspool/ /home/httpd/prtspool/ Alias /captchaspool/ /home/httpd/captchaspool/ +Alias /webdav/ /home/httpd/html/priv/ ScriptAlias /cgi-bin/ "/home/httpd/cgi-bin/" + + DAVLockDB /home/httpd/webdav/DAVLock + # ================================================================= Directories @@ -50,6 +54,12 @@ PerlCleanupHandler Apache::lonacc::clean PerlAuthenHandler Apache::checkauthen PerlSetVar lonOtherAuthen no + + PerlAuthenHandler Apache::lonshibauth + PerlSetVar lonOtherAuthen yes + PerlSetVar lonOtherAuthenType Shibboleth + + #PerlWarn On PerlAuthenHandler 'sub { return OK }' @@ -269,6 +279,38 @@ ErrorDocument 406 /adm/unauthorized ErrorDocument 500 /adm/errorhandler + + + + AuthType Basic + AuthName "LONCAPA username,domain" + Require valid-user + SSLRequireSSL + PerlAuthenHandler Apache::lonwebdavauth + PerlAuthzHandler Apache::lonwebdavacc + Dav On + DirectoryIndex index.missing + Options Indexes FollowSymLinks + ErrorDocument 403 /adm/nowebdav.html + ErrorDocument 404 /adm/notfound.html + ErrorDocument 406 /adm/unauthorized + ErrorDocument 500 /adm/errorhandler + + + + RewriteEngine on + RewriteRule .* http://%{HTTP_HOST}/adm/nowebdav.html [L] + + + + + + RewriteEngine on + RewriteRule .* http://%{HTTP_HOST}/adm/nowebdav.html [L] + + + + PerlAccessHandler Apache::lonracc @@ -467,16 +509,6 @@ ErrorDocument 403 /adm/login ErrorDocument 500 /adm/errorhandler - -AuthType LONCAPA -Require valid-user -PerlAuthzHandler Apache::lonacc -SetHandler perl-script -PerlHandler Apache::lonindexcourse -ErrorDocument 403 /adm/login -ErrorDocument 500 /adm/errorhandler - - AuthType LONCAPA Require valid-user @@ -520,12 +552,12 @@ ErrorDocument 403 /adm/login ErrorDocument 500 /adm/errorhandler - + AuthType LONCAPA Require valid-user PerlAuthzHandler Apache::lonacc SetHandler perl-script -PerlHandler Apache::lonpickresource +PerlHandler Apache::lonremote ErrorDocument 403 /adm/login ErrorDocument 500 /adm/errorhandler @@ -581,6 +613,17 @@ ErrorDocument 403 /adm/login ErrorDocument 500 /adm/errorhandler + +AuthType LONCAPA +Require valid-user +PerlAuthzHandler Apache::lonacc +SetHandler perl-script +PerlHandler Apache::londependencies +ErrorDocument 403 /adm/login +ErrorDocument 406 /adm/roles +ErrorDocument 500 /adm/errorhandler + + SetHandler perl-script PerlHandler Apache::lonlogin @@ -637,6 +680,21 @@ SetHandler perl-script PerlHandler Apache::migrateuser + + + AuthType shibboleth + ShibUseEnvironment On + ShibRequestSetting requireSession 1 + ShibRequestSetting redirectToSSL 443 + require valid-user + PerlAuthzHandler Apache::lonshibacc + PerlAuthzHandler Apache::lonacc + + + PerlTypeHandler Apache::lonnoshib + + + AuthType LONCAPA Require valid-user @@ -1243,7 +1301,18 @@ SetHandler perl-script PerlHandler Apache::lonwishlistdisplay ErrorDocument 403 /adm/login ErrorDocument 406 /adm/roles -ErrorDocument 500 /adm/errorhandler +ErrorDocument 500 /adm/errorhandler + + + +AuthType LONCAPA +Require valid-user +PerlAuthzHandler Apache::lonacc +SetHandler perl-script +PerlHandler Apache::lonblockingmenu +ErrorDocument 403 /adm/login +ErrorDocument 406 /adm/roles +ErrorDocument 500 /adm/errorhandler @@ -1448,6 +1517,7 @@ Options Indexes FollowSymLinks PerlSetVar lonVersion '' PerlSetVar lonIDsDir /home/httpd/lonIDs +PerlSetVar lonDAVsessDir /home/httpd/webdav/sessionIDs PerlSetVar lonTabDir /home/httpd/lonTabs PerlSetVar lonUsersDir /home/httpd/lonUsers PerlSetVar lonIconsURL /adm/lonIcons