--- loncom/loncapa_apache.conf	2006/08/29 14:21:17	1.154
+++ loncom/loncapa_apache.conf	2006/09/15 17:08:10	1.158
@@ -1,7 +1,7 @@
 ##
 ## loncapa_apache.conf -- Apache HTTP LON-CAPA configuration file
 ##
-## $Id: loncapa_apache.conf,v 1.154 2006/08/29 14:21:17 albertel Exp $
+## $Id: loncapa_apache.conf,v 1.158 2006/09/15 17:08:10 raeburn Exp $
 ##
 
 #
@@ -1157,6 +1157,13 @@ PerlHandler Apache::loncss
 ErrorDocument	  500 /adm/errorhandler
 </LocationMatch>
 
+<LocationMatch "^/adm/coursecatalog">
+SetHandler perl-script
+PerlHandler Apache::coursecatalog
+ErrorDocument	  500 /adm/errorhandler
+</LocationMatch>
+
+
 # ------------------------------------------------- Backdoor Adm Tests/Programs
 
 <Location /cgi-bin/loncron.pl>
@@ -1239,6 +1246,26 @@ PerlChildExitHandler Apache::lonacc::goo
 <Directory />
 Options None
 AllowOverride None
+order deny,allow
+deny from all
+</Directory>
+
+# Allow uploaded files to be served
+
+<Directory "/home/httpd/lonUsers">
+Options Includes FollowSymLinks
+AllowOverride None
+order allow,deny
+allow from all
+</Directory>
+ 
+# Allow construction space files to be served
+
+<Directory "/home/*/public_html/" >
+Options Includes FollowSymLinks
+AllowOverride
+order allow,deny
+allow from all
 </Directory>
 
 # Yes to symbolic links and server-side includes
@@ -1254,7 +1281,7 @@ allow from all
 
 <Directory /home/httpd/cgi-bin>
 AllowOverride None
-Options ExecCGI
+Options ExecCGI FollowSymLinks
 </Directory>
 
 # ============================================================= Access Handlers