--- loncom/loncapa_apache.conf 2011/01/18 00:21:57 1.201
+++ loncom/loncapa_apache.conf 2012/03/06 00:53:51 1.213
@@ -1,7 +1,7 @@
##
## loncapa_apache.conf -- Apache HTTP LON-CAPA configuration file
##
-## $Id: loncapa_apache.conf,v 1.201 2011/01/18 00:21:57 www Exp $
+## $Id: loncapa_apache.conf,v 1.213 2012/03/06 00:53:51 raeburn Exp $
##
#
@@ -38,7 +38,9 @@ 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 +52,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 }'
@@ -258,30 +266,43 @@ ErrorDocument 406 /adm/notinit.html
ErrorDocument 500 /adm/errorhandler
-
+
AuthType LONCAPA
Require valid-user
PerlAuthzHandler Apache::loncacc
SetHandler perl-script
-PerlHandler Apache::lonconstruct
ErrorDocument 403 /adm/login
ErrorDocument 404 /adm/notfound.html
ErrorDocument 406 /adm/unauthorized
ErrorDocument 500 /adm/errorhandler
-
-PerlAccessHandler Apache::lonracc
+
+
+ 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]
+
+
-
-AuthType LONCAPA
-Require valid-user
-PerlAuthzHandler Apache::loncacc
-ErrorDocument 403 /adm/login
-ErrorDocument 404 /adm/notfound.html
-ErrorDocument 406 /adm/unauthorized
-ErrorDocument 500 /adm/errorhandler
+
+PerlAccessHandler Apache::lonracc
@@ -319,22 +340,22 @@ ErrorDocument 500 /adm/errorhandler
# ------------------------------------------------------------------------- RAT
-
+
SetHandler perl-script
PerlHandler Apache::lonratedt
-
+
SetHandler perl-script
PerlHandler Apache::lonratedt
-
+
SetHandler perl-script
PerlHandler Apache::lonratsrv
-
+
SetHandler perl-script
PerlHandler Apache::lonratmenu
@@ -373,7 +394,7 @@ SetHandler perl-script
PerlHandler Apache::lonsequence
-
+
PerlAccessHandler Apache::publiccheck
SetHandler perl-script
PerlHandler Apache::lonmeta
@@ -390,24 +411,24 @@ PerlHandler Apache::lonmeta
-
+
SetHandler perl-script
PerlHandler Apache::lonrights
-
+
SetHandler perl-script
PerlHandler Apache::londatecheck
PerlHandler Apache::lonipcheck
PerlHandler Apache::lonxml
-
+
SetHandler perl-script
PerlHandler Apache::lonhomework
-
+
SetHandler perl-script
PerlHandler Apache::lonxml
@@ -531,6 +552,16 @@ ErrorDocument 403 /adm/login
ErrorDocument 500 /adm/errorhandler
+
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler Apache::lonacc
+SetHandler perl-script
+PerlHandler Apache::lonpickresource
+ErrorDocument 403 /adm/login
+ErrorDocument 500 /adm/errorhandler
+
+
AuthType LONCAPA
Require valid-user
@@ -638,6 +669,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
@@ -834,7 +880,7 @@ ErrorDocument 406 /adm/unauthorized
ErrorDocument 500 /adm/errorhandler
-
+
AuthType LONCAPA
Require valid-user
PerlAuthzHandler Apache::loncacc
@@ -846,18 +892,6 @@ ErrorDocument 406 /adm/unauthorized
ErrorDocument 500 /adm/errorhandler
-
-AuthType LONCAPA
-Require valid-user
-PerlAuthzHandler Apache::lonacc
-SetHandler perl-script
-PerlHandler Apache::lonpubdir
-ErrorDocument 403 /adm/login
-ErrorDocument 404 /adm/notfound.html
-ErrorDocument 406 /adm/unauthorized
-ErrorDocument 500 /adm/errorhandler
-
-
AuthType LONCAPA
Require valid-user
@@ -1110,6 +1144,18 @@ ErrorDocument 403 /adm/login
ErrorDocument 500 /adm/errorhandler
+
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler Apache::lonacc
+SetHandler perl-script
+PerlHandler Apache::londocs
+PerlCleanupHandler Apache::londocs::untiehash
+PerlCleanupHandler Apache::lonacc::cleanup
+ErrorDocument 403 /adm/login
+ErrorDocument 500 /adm/errorhandler
+
+
AuthType LONCAPA
Require valid-user
@@ -1241,12 +1287,23 @@ AuthType LONCAPA
Require valid-user
PerlAuthzHandler Apache::lonacc
SetHandler perl-script
-PerlHandler Apache::lonwishlist
+PerlHandler Apache::lonwishlistdisplay
ErrorDocument 403 /adm/login
ErrorDocument 406 /adm/roles
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
+
+
PerlAccessHandler Apache::publiccheck
AuthType LONCAPA
@@ -1449,6 +1506,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
@@ -1559,6 +1617,9 @@ PerlSetVar SSLEmail certificate@lon-
#-------------------------------------------------------------------------
+# ====================================== Include support for SSL rewrites
+
+Include conf/loncapa_rewrite.conf
# ====================================== Include machine-specific configuration