--- loncom/loncapa_apache.conf	2017/04/27 23:25:24	1.254
+++ loncom/loncapa_apache.conf	2020/09/11 19:37:39	1.272
@@ -2,7 +2,7 @@
 ## loncapa_apache.conf -- Apache HTTP LON-CAPA configuration file
 ##
 
-# $Id: loncapa_apache.conf,v 1.254 2017/04/27 23:25:24 raeburn Exp $
+# $Id: loncapa_apache.conf,v 1.272 2020/09/11 19:37:39 raeburn Exp $
 
 #
 # LON-CAPA Section (extensions to httpd.conf daemon configuration)
@@ -131,6 +131,7 @@ ErrorDocument     500 /adm/errorhandler
 </Location>
 
 <LocationMatch "^/+userfiles.*">
+Options +FollowSymLinks -Includes
 PerlAccessHandler       Apache::lontokacc
 PerlCleanupHandler	Apache::lontokacc::removefile
 PerlCleanupHandler	Apache::lonacc::cleanup
@@ -149,6 +150,10 @@ ErrorDocument     406 /adm/roles
 ErrorDocument	  500 /adm/errorhandler
 </LocationMatch>
 
+<LocationMatch "^/+uploaded/.+/.+/(portfolio|feedback|docs|groups)/.+">
+   Options +FollowSymLinks -Includes
+</LocationMatch>
+
 <LocationMatch "^/+editupload.*">
 AuthType LONCAPA
 Require valid-user
@@ -270,7 +275,7 @@ ErrorDocument     406 /adm/notinit.html
 ErrorDocument	  500 /adm/errorhandler
 </LocationMatch>
 
-<LocationMatch "^/adm/.*/exttools?$">
+<LocationMatch "^/adm/.*/ext\.tool$">
 AuthType LONCAPA
 Require valid-user
 PerlAuthzHandler        Apache::lonacc
@@ -294,6 +299,18 @@ ErrorDocument     406 /adm/notinit.html
 ErrorDocument     500 /adm/errorhandler
 </LocationMatch>
 
+<Location /adm/exturlcheck>
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler  Apache::lonacc
+SetHandler        perl-script
+PerlHandler       Apache::lonexturlcheck
+ErrorDocument     403 /adm/login
+ErrorDocument     404 /adm/notfound.html
+ErrorDocument     406 /adm/unauthorized
+ErrorDocument     500 /adm/errorhandler
+</Location>
+
 <LocationMatch "^/+priv/.*">
 AuthType LONCAPA
 Require valid-user
@@ -753,6 +770,26 @@ SetHandler perl-script
 PerlHandler Apache::lonlogin
 </Location>
 
+<LocationMatch "^/+adm/lti($|/)">
+SetHandler perl-script
+PerlHandler Apache::ltiauth
+</LocationMatch>
+
+<Location /adm/service/passback>
+SetHandler perl-script
+PerlHandler Apache::ltipassback
+</Location>
+
+<Location /adm/service/roster>
+SetHandler perl-script
+PerlHandler Apache::ltiroster
+</Location>
+
+<LocationMatch "^/adm/service/logout/\w+$">
+SetHandler perl-script
+PerlHandler Apache::ltilogout
+</LocationMatch>
+
 <Location /adm/restrictedaccess>
 PerlAccessHandler      Apache::publiccheck
 AuthType LONCAPA
@@ -773,6 +810,17 @@ PerlHandler Apache::blockedaccess
 ErrorDocument     500 /adm/errorhandler
 </Location>
 
+<Location /adm/protected>
+PerlAccessHandler      Apache::publiccheck
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
+SetHandler perl-script
+PerlHandler Apache::lonprotected
+ErrorDocument     403 /adm/login
+ErrorDocument     500 /adm/errorhandler
+</Location>
+
 <Location /adm/logout>
 AuthType LONCAPA
 Require valid-user
@@ -829,6 +877,16 @@ ErrorDocument     403 /adm/login
 ErrorDocument	  500 /adm/errorhandler
 </Location>
 
+<Location /adm/annotation>
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
+SetHandler perl-script
+PerlHandler Apache::admannotations
+ErrorDocument     403 /adm/login
+ErrorDocument     500 /adm/errorhandler
+</Location>
+
 <Location /adm/spellcheck>
 AuthType LONCAPA
 Require valid-user
@@ -1550,7 +1608,16 @@ SetHandler perl-script
 PerlHandler Apache::spellcheck
 </LocationMatch>
 
-
+<LocationMatch "^/tiny/[\w.-]+/\w+$">
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler Apache::lonacc
+SetHandler perl-script
+PerlHandler Apache::lontiny
+ErrorDocument     403 /adm/login
+ErrorDocument     406 /adm/roles
+ErrorDocument     500 /adm/errorhandler
+</LocationMatch>
 
 # ------------------------------------------------- Backdoor Adm Tests/Programs
 
@@ -1586,7 +1653,7 @@ AllowOverride None
 # Allow uploaded files to be served
 
 <Directory "/home/httpd/lonUsers">
-Options Includes FollowSymLinks
+Options FollowSymLinks
 AllowOverride None
 <IfModule mod_authz_core.c>
   Require all granted
@@ -1600,7 +1667,7 @@ AllowOverride None
 # Yes to symbolic links and server-side includes
 
 <Directory /home/httpd/html>
-Options Includes FollowSymLinks
+Options FollowSymLinks
 AllowOverride None
 <IfModule mod_authz_core.c>
   Require all granted
@@ -1628,7 +1695,7 @@ Options ExecCGI FollowSymLinks
 # Allow serving of files in prtspool
 
 <Directory "/home/httpd/prtspool/">
-Options Includes FollowSymLinks
+Options FollowSymLinks
 AllowOverride None
 <IfModule mod_authz_core.c>
   Require all granted
@@ -1642,7 +1709,7 @@ AllowOverride None
 # Allow serving of files in zipspool
 
 <Directory "/home/httpd/zipspool/">
-Options Includes FollowSymLinks
+Options FollowSymLinks
 AllowOverride None
 <IfModule mod_authz_core.c>
   Require all granted
@@ -1656,7 +1723,7 @@ AllowOverride None
 # Allow serving of files in captchaspool
 
 <Directory "/home/httpd/captchaspool/">
-Options Includes FollowSymLinks
+Options FollowSymLinks
 AllowOverride None
 <IfModule mod_authz_core.c>
   Require all granted
@@ -1675,6 +1742,10 @@ AllowOverride None
    DirectoryIndex disabled
 </DirectoryMatch>
 
+<DirectoryMatch "^/home/httpd/lonUsers/*">
+   Options +FollowSymLinks -Includes
+</DirectoryMatch>
+
 # ============================================================= Access Handlers
 
 # ------------------------------------------------- Allow server-status reports
@@ -1709,6 +1780,7 @@ Options Indexes FollowSymLinks
 
 PerlSetVar	 lonVersion  '<!-- VERSION -->'
 PerlSetVar       lonIDsDir    /home/httpd/lonIDs
+PerlSetVar       lonBalanceDir /home/httpd/balanceIDs
 PerlSetVar       lonDAVsessDir /home/httpd/webdav/sessionIDs
 PerlSetVar       lonTabDir    /home/httpd/lonTabs
 PerlSetVar       lonUsersDir  /home/httpd/lonUsers
@@ -1725,6 +1797,8 @@ PerlSetVar       lonIncludes  /home/http
 PerlSetVar       lonZipDir    /home/httpd/zipspool
 PerlSetVar       lonCaptchaDir     /home/httpd/captchaspool
 PerlSetVar       lonCaptchaDb     /home/httpd/captchadb 
+PerlSetVar       lonLTIDir    /home/httpd/lonLTItmp
+PerlSetVar       ltiIDsDir    /home/httpd/ltiIDs
 PerlSetVar       lonFontsDir     /home/httpd/html/adm/fonts
 # & separated list of % separated fields in order of
 # - internal name to call it, 
@@ -1739,7 +1813,7 @@ PerlSetVar       lonBrowsDet  explorer%m
 PerlSetVar       lonTextBrowsers windows\s+ce:lynx
 PerlSetVar       lonScansDir  /home/httpd/scantron
 PerlSetVar       lonScriptTimeout 10
-PerlSetVar	 BugzillaHost	http://bugs.lon-capa.org/
+PerlSetVar	 BugzillaHost	https://bugs.loncapa.org/
 PerlSetVar	 FAQHost	http://help.lon-capa.org/
 # -----------------------------------------------------------------------------
 # NOTE: lonSqlAccess key is the password for the MySQL user
@@ -1780,6 +1854,7 @@ 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