--- loncom/loncapa_apache.conf	2016/02/22 12:44:20	1.242
+++ loncom/loncapa_apache.conf	2017/04/27 23:25:24	1.254
@@ -2,7 +2,7 @@
 ## loncapa_apache.conf -- Apache HTTP LON-CAPA configuration file
 ##
 
-# $Id: loncapa_apache.conf,v 1.242 2016/02/22 12:44:20 raeburn Exp $
+# $Id: loncapa_apache.conf,v 1.254 2017/04/27 23:25:24 raeburn Exp $
 
 #
 # LON-CAPA Section (extensions to httpd.conf daemon configuration)
@@ -283,6 +283,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>
+
 <LocationMatch "^/+priv/.*">
 AuthType LONCAPA
 Require valid-user
@@ -458,7 +469,7 @@ SetHandler perl-script
 PerlHandler Apache::lonxml
 </LocationMatch>
 
-<LocationMatch "^/daxe(page|open)/priv/">
+<LocationMatch "^/daxepage/priv/">
 AuthType LONCAPA
 Require valid-user
 PerlAuthzHandler       Apache::loncacc
@@ -468,6 +479,12 @@ ErrorDocument     406 /adm/unauthorized
 ErrorDocument     500 /adm/errorhandler
 </LocationMatch>
 
+<LocationMatch "^/daxeopen/">
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
+</LocationMatch>
+
 <LocationMatch "^/daxe(page|open)/uploaded/">
 AuthType LONCAPA
 Require valid-user
@@ -483,7 +500,7 @@ SetHandler perl-script
 PerlHandler Apache::daxepage
 </LocationMatch>
 
-<LocationMatch "^/daxepage/uploaded/[^/]+/[^/]+/supplemental/.*html?$">
+<LocationMatch "^/daxepage/uploaded/[^/]+/[^/]+/.*html?$">
 SetHandler perl-script
 PerlHandler Apache::daxepage
 </LocationMatch>
@@ -493,20 +510,34 @@ SetHandler perl-script
 PerlHandler Apache::daxeopen
 </LocationMatch>
 
-<LocationMatch "^/daxeopen/priv/.*/$">
+<LocationMatch "^/daxeopen/$">
 SetHandler perl-script
 PerlHandler Apache::daxeopen
 </LocationMatch>
 
-<LocationMatch "^/daxeopen/uploaded/[^/]+/[^/]+/supplemental/.*html?$">
+<LocationMatch "^/daxeopen/(res|priv)/(.+/)?$">
 SetHandler perl-script
 PerlHandler Apache::daxeopen
 </LocationMatch>
 
+<LocationMatch "^/daxeopen/uploaded/[^/]+/[^/]+/.*html?$">
+SetHandler perl-script
+PerlHandler Apache::daxeopen
+</LocationMatch>
+
+<LocationMatch "(?i)^/daxeopen/priv/.+\.(?!task$|problem$|exam$|quiz$|assess$|survey$|library$|xml$|html$|htm$|xhtml$|xhtm$)[^.]*$">
 <IfModule mod_rewrite.c>
   RewriteEngine on
-  RewriteRule ^/daxeopen/(.*) /$1
+  RewriteRule /daxeopen/(.*) /$1
 </IfModule>
+</LocationMatch>
+
+<LocationMatch "(?i)^/daxeopen/(res/.*\.(jpg|jpeg|gif|png|svg))$">
+<IfModule mod_rewrite.c>
+  RewriteEngine on
+  RewriteRule /daxeopen/(.*) /$1
+</IfModule>
+</LocationMatch>
 
 <LocationMatch "^/daxesave$">
 AuthType LONCAPA
@@ -516,6 +547,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
@@ -1383,6 +1424,7 @@ PerlHandler Apache::groupsort
 PerlCleanupHandler Apache::groupsort::cleanup
 PerlCleanupHandler	Apache::lonacc::cleanup
 ErrorDocument     403 /adm/login
+ErrorDocument     406 /adm/roles
 ErrorDocument	  500 /adm/errorhandler
 </Location>
 
@@ -1417,6 +1459,17 @@ SetHandler             perl-script
 PerlHandler            Apache::lonblockingstatus
 </Location>
 
+<Location /adm/accesstimes>
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
+SetHandler             perl-script
+PerlHandler            Apache::lonaccesstimes
+ErrorDocument     403 /adm/login
+ErrorDocument     406 /adm/roles
+ErrorDocument     500 /adm/errorhandler
+</Location>
+
 <Location /adm/errorhandler>
 SetHandler perl-script
 PerlHandler Apache::lonerrorhandler
@@ -1544,20 +1597,6 @@ 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>
@@ -1740,6 +1779,7 @@ PerlSetVar lonCertificateDirectory /home
 
 PerlSetVar lonnetCertificateAuthority loncapaCA.pem
 PerlSetVar lonnetCertificate          lonhostcert.pem
+PerlSetVar lonnetHostnameCertificate  lonhostnamecert.pem
 
 #
 #  To generate the request for a certificate, and to negotiate the