--- loncom/loncapa_apache.conf	2024/02/28 19:41:54	1.215.2.30.2.8
+++ loncom/loncapa_apache.conf	2020/09/10 20:52:17	1.271
@@ -2,7 +2,7 @@
 ## loncapa_apache.conf -- Apache HTTP LON-CAPA configuration file
 ##
 
-# $Id: loncapa_apache.conf,v 1.215.2.30.2.8 2024/02/28 19:41:54 raeburn Exp $
+# $Id: loncapa_apache.conf,v 1.271 2020/09/10 20:52:17 raeburn Exp $
 
 #
 # LON-CAPA Section (extensions to httpd.conf daemon configuration)
@@ -150,10 +150,6 @@ ErrorDocument     406 /adm/roles
 ErrorDocument	  500 /adm/errorhandler
 </LocationMatch>
 
-<LocationMatch "^/+uploaded/.+/.+/(portfolio|feedback|docs|groups|supplemental)/.+">
-   Options +FollowSymLinks -Includes
-</LocationMatch>
-
 <LocationMatch "^/+editupload.*">
 AuthType LONCAPA
 Require valid-user
@@ -193,13 +189,6 @@ SetHandler perl-script
 PerlHandler Apache::lonsequence
 </LocationMatch>
 
-<LocationMatch "^/+uploaded/.*/.*/docs/.*\.tex$">
-SetHandler perl-script
-PerlHandler Apache::londatecheck
-PerlHandler Apache::lonipcheck
-PerlHandler Apache::lontex
-</LocationMatch>
-
 <LocationMatch "^/+public/.*/syllabus$">
 PerlAccessHandler      Apache::publiccheck
 AuthType LONCAPA
@@ -287,7 +276,6 @@ AuthType LONCAPA
 Require valid-user
 PerlAuthzHandler        Apache::lonacc
 SetHandler              perl-script
-PerlHandler             Apache::lonslotcheck
 PerlHandler             Apache::londatecheck
 PerlHandler             Apache::lonipcheck
 PerlHandler             Apache::lonexttool
@@ -296,6 +284,17 @@ ErrorDocument     406 /adm/notinit.html
 ErrorDocument     500 /adm/errorhandler
 </LocationMatch>
 
+<LocationMatch "^/adm/placement$">
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler        Apache::lonacc
+SetHandler              perl-script
+PerlHandler             Apache::lonplacementtest
+ErrorDocument     404 /adm/notfound.html
+ErrorDocument     406 /adm/notinit.html
+ErrorDocument     500 /adm/errorhandler
+</LocationMatch>
+
 <Location /adm/exturlcheck>
 AuthType LONCAPA
 Require valid-user
@@ -429,10 +428,8 @@ PerlCleanupHandler Apache::lonindexer::c
 PerlCleanupHandler	Apache::lonacc::cleanup
 </LocationMatch>
 
-<LocationMatch "^/+res/.*\.tex$">
+<LocationMatch "^/+res.*\.tex$">
 SetHandler perl-script
-PerlHandler Apache::londatecheck
-PerlHandler Apache::lonipcheck
 PerlHandler Apache::lontex
 </LocationMatch>
 
@@ -501,33 +498,13 @@ Require valid-user
 PerlAuthzHandler       Apache::lonacc
 </LocationMatch>
 
-<LocationMatch "^/daxeopen/priv/[^/]+/[^/]+/">
-AuthType LONCAPA
-Require valid-user
-PerlAuthzHandler       Apache::loncacc
-</LocationMatch>
-
-<LocationMatch "^/daxeopen/(res/|$)">
-ErrorDocument     403 /adm/login
-ErrorDocument     404 /adm/notfound.html
-ErrorDocument     406 /adm/roles
-ErrorDocument     500 /adm/errorhandler
-</LocationMatch>
-
-<LocationMatch "^/daxeopen/priv/">
-ErrorDocument     403 /adm/login
-ErrorDocument     404 /adm/notfound.html
-ErrorDocument     406 /adm/unauthorized
-ErrorDocument     500 /adm/errorhandler
-</LocationMatch>
-
 <LocationMatch "^/daxe(page|open)/uploaded/">
 AuthType LONCAPA
 Require valid-user
 PerlAuthzHandler       Apache::lonacc
 ErrorDocument     403 /adm/login
 ErrorDocument     404 /adm/notfound.html
-ErrorDocument     406 /adm/roles
+ErrorDocument     406 /adm/unauthorized
 ErrorDocument     500 /adm/errorhandler
 </LocationMatch>
 
@@ -536,7 +513,7 @@ SetHandler perl-script
 PerlHandler Apache::daxepage
 </LocationMatch>
 
-<LocationMatch "^/daxepage/uploaded/[^/]+/[^/]+/(docs|supplemental)/.*html?$">
+<LocationMatch "^/daxepage/uploaded/[^/]+/[^/]+/.*html?$">
 SetHandler perl-script
 PerlHandler Apache::daxepage
 </LocationMatch>
@@ -551,12 +528,12 @@ SetHandler perl-script
 PerlHandler Apache::daxeopen
 </LocationMatch>
 
-<LocationMatch "^/daxeopen/(res|priv|uploaded)/(.+/)?$">
+<LocationMatch "^/daxeopen/(res|priv)/(.+/)?$">
 SetHandler perl-script
 PerlHandler Apache::daxeopen
 </LocationMatch>
 
-<LocationMatch "^/daxeopen/uploaded/[^/]+/[^/]+/(docs|supplemental)/.*html?$">
+<LocationMatch "^/daxeopen/uploaded/[^/]+/[^/]+/.*html?$">
 SetHandler perl-script
 PerlHandler Apache::daxeopen
 </LocationMatch>
@@ -568,13 +545,6 @@ PerlHandler Apache::daxeopen
 </IfModule>
 </LocationMatch>
 
-<LocationMatch "(?i)^/daxeopen/uploaded/.+\.(?!html$|htm$|xhtml$|xhtm$)[^.]*$">
-<IfModule mod_rewrite.c>
-  RewriteEngine on
-  RewriteRule /daxeopen/(.*) /$1
-</IfModule>
-</LocationMatch>
-
 <LocationMatch "(?i)^/daxeopen/(res/.*\.(jpg|jpeg|gif|png|svg))$">
 <IfModule mod_rewrite.c>
   RewriteEngine on
@@ -590,6 +560,16 @@ SetHandler perl-script
 PerlHandler Apache::daxesave
 </LocationMatch>
 
+<Location /adm/coursepub>
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler Apache::lonacc
+SetHandler perl-script
+PerlHandler Apache::loncoursepub
+ErrorDocument     404 /adm/notfound.html
+ErrorDocument     500 /adm/errorhandler
+</Location>
+
 <LocationMatch "^/adm/wrapper/">
 AuthType LONCAPA
 Require valid-user
@@ -656,6 +636,16 @@ 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
@@ -699,12 +689,12 @@ ErrorDocument     403 /adm/login
 ErrorDocument	  500 /adm/errorhandler
 </Location>
 
-<Location /adm/remote>
+<Location /adm/pickresource>
 AuthType LONCAPA
 Require valid-user
 PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
-PerlHandler Apache::lonremote
+PerlHandler Apache::lonpickresource
 ErrorDocument     403 /adm/login
 ErrorDocument     500 /adm/errorhandler
 </Location>
@@ -771,32 +761,11 @@ ErrorDocument     406 /adm/roles
 ErrorDocument     500 /adm/errorhandler
 </Location>
 
-<Location /adm/courseuser>
-AuthType LONCAPA
-Require valid-user
-PerlAuthzHandler       Apache::lonacc
-SetHandler perl-script
-PerlHandler Apache::loncourseuser
-ErrorDocument     403 /adm/login
-ErrorDocument     406 /adm/roles
-ErrorDocument     500 /adm/errorhandler
-</Location>
-
 <Location /adm/login>
 SetHandler perl-script
 PerlHandler Apache::lonlogin
 </Location>
 
-<LocationMatch "^/+adm/launch/tiny/[\w.-]+/\w+">
-SetHandler perl-script
-PerlHandler Apache::ltiauth
-</LocationMatch>
-
-<Location /adm/relaunch>
-SetHandler perl-script
-PerlHandler Apache::lonrelaunch
-</Location>
-
 <LocationMatch "^/+adm/lti($|/)">
 SetHandler perl-script
 PerlHandler Apache::ltiauth
@@ -880,7 +849,6 @@ PerlHandler Apache::migrateuser
 </Location>
 
 <Location /adm/sso>
-  Header set Cache-Control "private,no-store,no-cache,max-age=0"
   <IfModule mod_shib>
     AuthType shibboleth
     ShibUseEnvironment On
@@ -889,25 +857,12 @@ PerlHandler Apache::migrateuser
     require valid-user
     PerlAuthzHandler       Apache::lonshibacc
     PerlAuthzHandler       Apache::lonacc
-    ErrorDocument     403 /adm/login
-    ErrorDocument     500 /adm/errorhandler
   </IfModule>
   <IfModule !mod_shib>
     PerlTypeHandler        Apache::lonnoshib
   </IfModule>
 </Location>
 
-<Location /adm/linkexit>
-AuthType LONCAPA
-Require valid-user
-PerlAuthzHandler       Apache::lonacc
-SetHandler perl-script
-PerlHandler Apache::lonlinkexit
-ErrorDocument     403 /adm/login
-ErrorDocument     409 /adm/preferences?action=lockwarning
-ErrorDocument     500 /adm/errorhandler
-</Location>
-
 <Location /adm/annotations>
 AuthType LONCAPA
 Require valid-user
@@ -1535,7 +1490,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>
@@ -1783,6 +1738,10 @@ AllowOverride None
    DirectoryIndex disabled
 </DirectoryMatch>
 
+<DirectoryMatch "^/home/httpd/lonUsers/*">
+   Options +FollowSymLinks -Includes
+</DirectoryMatch>
+
 # ============================================================= Access Handlers
 
 # ------------------------------------------------- Allow server-status reports
@@ -1815,7 +1774,7 @@ Options Indexes FollowSymLinks
 # ******** THESE "SHOULD" NEVER BE ALTERED BY THE USER ************************
 # ====================================== Internal Settings / Perl Configuration
 
-PerlSetVar	 lonVersion   '<!-- VERSION -->'
+PerlSetVar	 lonVersion  '<!-- VERSION -->'
 PerlSetVar       lonIDsDir    /home/httpd/lonIDs
 PerlSetVar       lonBalanceDir /home/httpd/balanceIDs
 PerlSetVar       lonDAVsessDir /home/httpd/webdav/sessionIDs
@@ -1890,6 +1849,8 @@ PerlSetVar lonCertificateDirectory /home
 
 PerlSetVar lonnetCertificateAuthority loncapaCA.pem
 PerlSetVar lonnetCertificate          lonhostcert.pem
+PerlSetVar lonnetHostnameCertificate  lonhostnamecert.pem
+PerlSetVar lonnetCertRevocationList   loncapaCAcrl.pem
 
 #
 #  To generate the request for a certificate, and to negotiate the