--- loncom/loncapa_apache.conf	2011/12/28 21:49:41	1.208
+++ 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.208 2011/12/28 21:49:41 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/"
+<IfModule mod_dav_fs.c>
+    DAVLockDB /home/httpd/webdav/DAVLock
+</IfModule>
 
 # ================================================================= Directories
 
@@ -50,6 +54,12 @@ PerlCleanupHandler	Apache::lonacc::clean
 PerlAuthenHandler Apache::checkauthen
 PerlSetVar lonOtherAuthen no
 
+<IfModule mod_shib>
+    PerlAuthenHandler Apache::lonshibauth
+    PerlSetVar lonOtherAuthen yes
+    PerlSetVar lonOtherAuthenType Shibboleth
+</IfModule>
+
 #PerlWarn On
 <LocationMatch "^/+res/adm/pages/[^/]+\.(gif|png)$">
 PerlAuthenHandler	'sub { return OK }' 
@@ -269,6 +279,38 @@ ErrorDocument     406 /adm/unauthorized
 ErrorDocument	  500 /adm/errorhandler
 </LocationMatch>
 
+<LocationMatch "^/+webdav/[\w\-]+/[\w\-]+/">
+  <IfModule mod_dav.c>
+    <IfModule mod_ssl.c>
+      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
+    </IfModule>
+    <IfModule !mod_ssl.c>
+      <IfModule mod_rewrite.c>
+        RewriteEngine on
+        RewriteRule .* http://%{HTTP_HOST}/adm/nowebdav.html [L]
+      </IfModule>
+    </IfModule>
+  </IfModule>
+  <IfModule !mod_dav.c>
+    <IfModule mod_rewrite.c>
+      RewriteEngine on
+      RewriteRule .* http://%{HTTP_HOST}/adm/nowebdav.html [L]
+    </IfModule>
+  </IfModule>
+</LocationMatch>
+
 <LocationMatch "^/+raw.*">
 PerlAccessHandler Apache::lonracc
 </LocationMatch>
@@ -467,16 +509,6 @@ ErrorDocument     403 /adm/login
 ErrorDocument     500 /adm/errorhandler
 </Location>
 
-<Location /adm/indexcourse>
-AuthType LONCAPA
-Require valid-user
-PerlAuthzHandler       Apache::lonacc
-SetHandler perl-script
-PerlHandler Apache::lonindexcourse
-ErrorDocument     403 /adm/login
-ErrorDocument     500 /adm/errorhandler
-</Location>
-
 <Location /adm/statistics>
 AuthType LONCAPA
 Require valid-user
@@ -520,12 +552,12 @@ ErrorDocument     403 /adm/login
 ErrorDocument	  500 /adm/errorhandler
 </Location>
 
-<Location /adm/pickresource>
+<Location /adm/remote>
 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
 </Location>
@@ -581,6 +613,17 @@ ErrorDocument     403 /adm/login
 ErrorDocument	  500 /adm/errorhandler
 </Location>
 
+<Location /adm/dependencies>
+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
+</Location>
+
 <Location /adm/login>
 SetHandler perl-script
 PerlHandler Apache::lonlogin
@@ -637,6 +680,21 @@ SetHandler perl-script
 PerlHandler Apache::migrateuser
 </Location>
 
+<Location /adm/sso>
+  <IfModule mod_shib>
+    AuthType shibboleth
+    ShibUseEnvironment On
+    ShibRequestSetting requireSession 1
+    ShibRequestSetting redirectToSSL 443
+    require valid-user
+    PerlAuthzHandler       Apache::lonshibacc
+    PerlAuthzHandler       Apache::lonacc
+  </IfModule>
+  <IfModule !mod_shib>
+    PerlTypeHandler        Apache::lonnoshib
+  </IfModule>
+</Location>
+
 <Location /adm/annotations>
 AuthType LONCAPA
 Require valid-user
@@ -1243,7 +1301,7 @@ SetHandler perl-script
 PerlHandler Apache::lonwishlistdisplay
 ErrorDocument     403 /adm/login
 ErrorDocument     406 /adm/roles
-ErrorDocument	  500 /adm/errorhandler
+ErrorDocument     500 /adm/errorhandler
 </Location>
 
 <Location /adm/setblock>
@@ -1253,6 +1311,7 @@ PerlAuthzHandler       Apache::lonacc
 SetHandler             perl-script
 PerlHandler            Apache::lonblockingmenu
 ErrorDocument     403 /adm/login
+ErrorDocument     406 /adm/roles
 ErrorDocument     500 /adm/errorhandler
 </Location>
 
@@ -1458,6 +1517,7 @@ Options Indexes FollowSymLinks
 
 PerlSetVar	 lonVersion   '<!-- VERSION -->'
 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