--- loncom/loncapa_apache.conf	2016/11/30 02:32:47	1.215.2.19
+++ loncom/loncapa_apache.conf	2020/09/04 19:39:42	1.215.2.26
@@ -2,7 +2,7 @@
 ## loncapa_apache.conf -- Apache HTTP LON-CAPA configuration file
 ##
 
-# $Id: loncapa_apache.conf,v 1.215.2.19 2016/11/30 02:32:47 raeburn Exp $
+# $Id: loncapa_apache.conf,v 1.215.2.26 2020/09/04 19:39:42 raeburn Exp $
 
 #
 # LON-CAPA Section (extensions to httpd.conf daemon configuration)
@@ -270,6 +270,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
@@ -707,6 +719,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
@@ -1464,7 +1486,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
@@ -1475,24 +1497,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
@@ -1520,7 +1528,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
@@ -1534,7 +1542,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
@@ -1548,7 +1556,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
@@ -1601,6 +1609,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
@@ -1631,7 +1640,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