--- loncom/loncapa_apache.conf	2006/09/21 16:24:09	1.154.2.2
+++ loncom/loncapa_apache.conf	2006/08/29 21:41:08	1.155
@@ -1,7 +1,7 @@
 ##
 ## loncapa_apache.conf -- Apache HTTP LON-CAPA configuration file
 ##
-## $Id: loncapa_apache.conf,v 1.154.2.2 2006/09/21 16:24:09 albertel Exp $
+## $Id: loncapa_apache.conf,v 1.155 2006/08/29 21:41:08 raeburn Exp $
 ##
 
 #
@@ -1157,6 +1157,12 @@ PerlHandler Apache::loncss
 ErrorDocument	  500 /adm/errorhandler
 </LocationMatch>
 
+<LocationMatch "^/adm/coursecatalog">
+SetHandler perl-script
+PerlHandler Apache::coursecatalog
+</LocationMatch>
+
+
 # ------------------------------------------------- Backdoor Adm Tests/Programs
 
 <Location /cgi-bin/loncron.pl>
@@ -1239,26 +1245,6 @@ 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
@@ -1274,18 +1260,7 @@ allow from all
 
 <Directory /home/httpd/cgi-bin>
 AllowOverride None
-Options ExecCGI FollowSymLinks
-order allow,deny
-allow from all
-</Directory>
-
-# Allow serving of files in prtspool
-
-<Directory "/home/httpd/prtspool/">
-Options Includes FollowSymLinks
-AllowOverride None
-order allow,deny
-allow from all
+Options ExecCGI
 </Directory>
 
 # ============================================================= Access Handlers