--- loncom/loncapa_apache.conf	2017/02/24 17:35:01	1.253
+++ loncom/loncapa_apache.conf	2018/12/27 20:11:29	1.265
@@ -2,7 +2,7 @@
 ## loncapa_apache.conf -- Apache HTTP LON-CAPA configuration file
 ##
 
-# $Id: loncapa_apache.conf,v 1.253 2017/02/24 17:35:01 damieng Exp $
+# $Id: loncapa_apache.conf,v 1.265 2018/12/27 20:11:29 raeburn Exp $
 
 #
 # LON-CAPA Section (extensions to httpd.conf daemon configuration)
@@ -270,7 +270,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
@@ -753,6 +753,21 @@ 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>
+
 <Location /adm/restrictedaccess>
 PerlAccessHandler      Apache::publiccheck
 AuthType LONCAPA
@@ -829,6 +844,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 +1575,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 +1620,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
@@ -1597,24 +1631,10 @@ AllowOverride None
 </IfModule>
 </Directory>
  
-# Allow construction space files to be served
-
-<Directory "/home/*/public_html/" >
-Options Includes FollowSymLinks
-AllowOverride
-<IfModule mod_authz_core.c>
-  Require all granted
-</IfModule>
-<IfModule !mod_authz_core.c>
-  order allow,deny
-  allow from all
-</IfModule>
-</Directory>
-
 # 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
@@ -1642,7 +1662,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
@@ -1656,7 +1676,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
@@ -1670,7 +1690,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
@@ -1723,6 +1743,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
@@ -1739,6 +1760,7 @@ 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       lonFontsDir     /home/httpd/html/adm/fonts
 # & separated list of % separated fields in order of
 # - internal name to call it, 
@@ -1794,6 +1816,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