--- loncom/loncapa_apache.conf	2018/01/12 13:34:08	1.262
+++ loncom/loncapa_apache.conf	2019/01/27 16:02:51	1.267
@@ -2,7 +2,7 @@
 ## loncapa_apache.conf -- Apache HTTP LON-CAPA configuration file
 ##
 
-# $Id: loncapa_apache.conf,v 1.262 2018/01/12 13:34:08 raeburn Exp $
+# $Id: loncapa_apache.conf,v 1.267 2019/01/27 16:02:51 raeburn Exp $
 
 #
 # LON-CAPA Section (extensions to httpd.conf daemon configuration)
@@ -788,6 +788,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
@@ -844,6 +855,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
@@ -1565,7 +1586,7 @@ SetHandler perl-script
 PerlHandler Apache::spellcheck
 </LocationMatch>
 
-<LocationMatch "^/tiny/[\w.]+/\w+$">
+<LocationMatch "^/tiny/[\w.-]+/\w+$">
 AuthType LONCAPA
 Require valid-user
 PerlAuthzHandler Apache::lonacc
@@ -1733,6 +1754,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
@@ -1805,6 +1827,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