Diff for /loncom/loncapa_apache.conf between versions 1.26.2.1 and 1.48

version 1.26.2.1, 2003/01/10 21:31:03 version 1.48, 2003/05/12 21:22:57
Line 3 Line 3
 ##  ##
 ## $Id$  ## $Id$
 ##  ##
 ## 1/11/2002 - Scott Harrison  
 ## 2/19/2002 - Scott Harrison  
 ## 2/28/2002 - Scott Harrison  
 ## 3/2/2002 - Scott Harrison  
 ## 5/12/2002 - Scott Harrison  
   
 #  #
 # LON-CAPA Section (extensions to httpd.conf daemon configuration)  # LON-CAPA Section (extensions to httpd.conf daemon configuration)
Line 23  Group www Line 18  Group www
   
 # ======================================================= Shared Object Modules  # ======================================================= Shared Object Modules
   
 LoadModule perl_module       modules/libperl.so  LoadModule perl_module       modules/mod_perl.so
   <IfDefine !MODPERL2>
 AddModule mod_perl.c  AddModule mod_perl.c
   </IfDefine>
   
 # =============================================================== Miscellaneous  # =============================================================== Miscellaneous
   
 ServerAdmin korte@lite.msu.edu  ServerAdmin korte@lite.msu.edu
 ExtendedStatus On  ExtendedStatus On
   
 #  #
 # LON-CAPA Section (extensions to srm.conf name space servicing)  # LON-CAPA Section (extensions to srm.conf name space servicing)
 #  #
Line 45  ScriptAlias /cgi-bin/ "/home/httpd/cgi-b Line 41  ScriptAlias /cgi-bin/ "/home/httpd/cgi-b
   
 PerlTransHandler Apache::lontrans  PerlTransHandler Apache::lontrans
   
   #PerlWarn On
 <LocationMatch "^/+res.*">  <LocationMatch "^/+res.*">
 PerlAccessHandler       Apache::lonacc  PerlAccessHandler       Apache::lonacc
 PerlHeaderParserHandler Apache::lonrep  PerlHeaderParserHandler Apache::lonrep
Line 64  ErrorDocument     404 /adm/notfound.html Line 61  ErrorDocument     404 /adm/notfound.html
 ErrorDocument  500 /adm/errorhandler  ErrorDocument  500 /adm/errorhandler
 </LocationMatch>  </LocationMatch>
   
 <LocationMatch "^/+public/.*/syllabus">  <LocationMatch "^/+public/.*/syllabus$">
 PerlAccessHandler Apache::lonacc  PerlAccessHandler Apache::lonacc
 SetHandler              perl-script  SetHandler              perl-script
 PerlHandler             Apache::lonsyllabus  PerlHandler             Apache::lonsyllabus
Line 72  ErrorDocument     404 /adm/notfound.html Line 69  ErrorDocument     404 /adm/notfound.html
 ErrorDocument  500 /adm/errorhandler  ErrorDocument  500 /adm/errorhandler
 </LocationMatch>  </LocationMatch>
   
 <LocationMatch "^/adm/.*/aboutme">  <LocationMatch "^/adm/.*/aboutme$">
 PerlAccessHandler Apache::lonacc  PerlAccessHandler Apache::lonacc
 SetHandler              perl-script  SetHandler              perl-script
 PerlHandler             Apache::lonaboutme  PerlHandler             Apache::lonaboutme
Line 80  ErrorDocument     404 /adm/notfound.html Line 77  ErrorDocument     404 /adm/notfound.html
 ErrorDocument  500 /adm/errorhandler  ErrorDocument  500 /adm/errorhandler
 </LocationMatch>  </LocationMatch>
   
 <LocationMatch "^/adm/.*/smppg">  <LocationMatch "^/adm/.*/smppg$">
 PerlAccessHandler Apache::lonacc  PerlAccessHandler Apache::lonacc
 SetHandler              perl-script  SetHandler              perl-script
 PerlHandler             Apache::lonsimplepage  PerlHandler             Apache::lonsimplepage
Line 88  ErrorDocument     404 /adm/notfound.html Line 85  ErrorDocument     404 /adm/notfound.html
 ErrorDocument  500 /adm/errorhandler  ErrorDocument  500 /adm/errorhandler
 </LocationMatch>  </LocationMatch>
   
 <LocationMatch "^/adm/.*/bulletinboard">  <LocationMatch "^/adm/.*/bulletinboard$">
 PerlAccessHandler Apache::lonacc  PerlAccessHandler Apache::lonacc
 SetHandler              perl-script  SetHandler              perl-script
 PerlHandler             Apache::lonbulletin  PerlHandler             Apache::lonbulletin
Line 119  ErrorDocument   500 /adm/errorhandler Line 116  ErrorDocument   500 /adm/errorhandler
 AllowOverride None  AllowOverride None
 </LocationMatch>  </LocationMatch>
   
   <LocationMatch "^/adm/helper/.*\.helper$">
   PerlAccessHandler Apache::lonacc
   SetHandler        perl-script
   PerlHandler       Apache::lonhelper
   ErrorDocument     403 /adm/login
   ErrorDocument     404 /adm/notfound.html
   ErrorDocument     406 /adm/unauthorized
   ErrorDocument     500 /adm/errorhandler
   </LocationMatch>
   
 <LocationMatch "/prtspool">  <LocationMatch "/prtspool">
 PerlAccessHandler Apache::lonacc  PerlAccessHandler Apache::lonacc
 ErrorDocument     403 /adm/login  ErrorDocument     403 /adm/login
Line 174  SetHandler perl-script Line 181  SetHandler perl-script
 PerlHandler Apache::lonsequence  PerlHandler Apache::lonsequence
 </LocationMatch>  </LocationMatch>
   
 <LocationMatch "^/(res|\~).*\.meta$>  <LocationMatch "^/(res|\~|public|uploaded|adm).*\.meta$>
 SetHandler perl-script  SetHandler perl-script
 PerlHandler Apache::lonmeta  PerlHandler Apache::lonmeta
 </LocationMatch>  </LocationMatch>
   
 <LocationMatch "^/(res|\~).*\.(xml|html|htm|xhtml|xhtm)$">  <LocationMatch "^/(res|\~).*\.rights$>
   SetHandler perl-script
   PerlHandler Apache::lonrights
   </LocationMatch>
   
   <LocationMatch "^/(res|public|uploaded|\~).*\.(xml|html|htm|xhtml|xhtm)$">
 SetHandler perl-script  SetHandler perl-script
 PerlHandler Apache::lonxml  PerlHandler Apache::lonxml
 </LocationMatch>  </LocationMatch>
   
 <LocationMatch "^/(res|\~).*\.(problem|exam|quiz|assess|survey|form|library)$">  <LocationMatch "^/(res|public|uploaded|\~).*\.(problem|exam|quiz|assess|survey|form|library)$">
 SetHandler perl-script  SetHandler perl-script
 PerlHandler Apache::lonhomework  PerlHandler Apache::lonhomework
 </LocationMatch>  </LocationMatch>
Line 224  ErrorDocument     403 /adm/login Line 236  ErrorDocument     403 /adm/login
 ErrorDocument  500 /adm/errorhandler  ErrorDocument  500 /adm/errorhandler
 </Location>  </Location>
   
   <Location /adm/menu>
   PerlAccessHandler       Apache::lonacc
   SetHandler perl-script
   PerlHandler Apache::lonmenu
   ErrorDocument     403 /adm/login
   ErrorDocument  500 /adm/errorhandler
   </Location>
   
   <Location /adm/remote>
   PerlAccessHandler       Apache::lonacc
   SetHandler perl-script
   PerlHandler Apache::lonremote
   ErrorDocument     403 /adm/login
   ErrorDocument  500 /adm/errorhandler
   </Location>
   
   <Location /adm/pickstudent>
   PerlAccessHandler       Apache::lonacc
   SetHandler perl-script
   PerlHandler Apache::lonpickstudent
   ErrorDocument     403 /adm/login
   ErrorDocument  500 /adm/errorhandler
   </Location>
   
   <Location /adm/pickcourse>
   PerlAccessHandler       Apache::lonacc
   SetHandler perl-script
   PerlHandler Apache::lonpickcourse
   ErrorDocument     403 /adm/login
   ErrorDocument  500 /adm/errorhandler
   </Location>
   
 <Location /adm/login>  <Location /adm/login>
 SetHandler perl-script  SetHandler perl-script
 PerlHandler Apache::lonlogin  PerlHandler Apache::lonlogin
Line 261  ErrorDocument   500 /adm/errorhandler Line 305  ErrorDocument   500 /adm/errorhandler
 PerlAccessHandler       Apache::lonacc  PerlAccessHandler       Apache::lonacc
 SetHandler perl-script  SetHandler perl-script
 PerlHandler Apache::lonpageflip  PerlHandler Apache::lonpageflip
   PerlCleanupHandler Apache::lonpageflip::cleanup
 ErrorDocument     406 /adm/roles  ErrorDocument     406 /adm/roles
 ErrorDocument     403 /adm/login  ErrorDocument     403 /adm/login
 ErrorDocument  500 /adm/errorhandler  ErrorDocument  500 /adm/errorhandler
Line 270  ErrorDocument   500 /adm/errorhandler Line 315  ErrorDocument   500 /adm/errorhandler
 PerlAccessHandler       Apache::lonacc  PerlAccessHandler       Apache::lonacc
 SetHandler perl-script  SetHandler perl-script
 PerlHandler Apache::lonambiguous  PerlHandler Apache::lonambiguous
   PerlCleanupHandler Apache::lonambiguous::cleanup
 ErrorDocument     403 /adm/login  ErrorDocument     403 /adm/login
 ErrorDocument  500 /adm/errorhandler  ErrorDocument  500 /adm/errorhandler
 </Location>  </Location>
Line 291  ErrorDocument     406 /adm/roles Line 337  ErrorDocument     406 /adm/roles
 ErrorDocument  500 /adm/errorhandler  ErrorDocument  500 /adm/errorhandler
 </Location>  </Location>
   
   <Location /adm/wizard>
   PerlAccessHandler       Apache::lonacc
   SetHandler perl-script
   PerlHandler Apache::lonwizard
   ErrorDocument     403 /adm/login
   ErrorDocument     406 /adm/roles
   ErrorDocument  500 /adm/errorhandler
   </Location>
   
 <Location /adm/grades>  <Location /adm/grades>
 PerlAccessHandler       Apache::lonacc  PerlAccessHandler       Apache::lonacc
 SetHandler perl-script  SetHandler perl-script
Line 436  ErrorDocument     406 /adm/roles Line 491  ErrorDocument     406 /adm/roles
 ErrorDocument  500 /adm/errorhandler  ErrorDocument  500 /adm/errorhandler
 </Location>  </Location>
   
   <Location /adm/managekeys>
   PerlAccessHandler       Apache::lonacc
   SetHandler perl-script
   PerlHandler Apache::lonmanagekeys
   ErrorDocument     403 /adm/login
   ErrorDocument     406 /adm/roles
   ErrorDocument  500 /adm/errorhandler
   </Location>
   
 <Location /adm/printout>  <Location /adm/printout>
 PerlAccessHandler       Apache::lonacc  PerlAccessHandler       Apache::lonacc
 SetHandler perl-script  SetHandler perl-script
Line 456  ErrorDocument   500 /adm/errorhandler Line 520  ErrorDocument   500 /adm/errorhandler
 <Location /adm/coursedocs>  <Location /adm/coursedocs>
 PerlAccessHandler       Apache::lonacc  PerlAccessHandler       Apache::lonacc
 SetHandler perl-script  SetHandler perl-script
   PerlCleanupHandler Apache::coursedocs::untiehash
 PerlHandler Apache::londocs  PerlHandler Apache::londocs
 ErrorDocument     403 /adm/login  ErrorDocument     403 /adm/login
 ErrorDocument  500 /adm/errorhandler  ErrorDocument  500 /adm/errorhandler
Line 573  AuthUserFile /home/httpd/lonTabs/htpassw Line 638  AuthUserFile /home/httpd/lonTabs/htpassw
 require user lonadm  require user lonadm
 </Location>  </Location>
   
   <Location /cgi-bin/userstatus.pl>
   AuthName "LON-CAPA Network Administration"
   AuthType Basic
   AuthUserFile /home/httpd/lonTabs/htpasswd
   require user lonadm
   </Location>
   
 <Location /cgi-bin/lonversions.pl>  <Location /cgi-bin/lonversions.pl>
 AuthName "LON-CAPA Network Administration"  AuthName "LON-CAPA Network Administration"
 AuthType Basic  AuthType Basic
Line 685  PerlSetVar       lonSockDir   /home/http Line 757  PerlSetVar       lonSockDir   /home/http
 PerlSetVar       lonDocRoot   /home/httpd/html  PerlSetVar       lonDocRoot   /home/httpd/html
 PerlSetVar       lonIncludes  /home/httpd/html/res/adm/includes  PerlSetVar       lonIncludes  /home/httpd/html/res/adm/includes
 PerlSetVar       lonBrowsDet  netscape:mozilla:msie:mozilla\/(\d+\.\d+)\s:9999:9999&explorer:msie:netscape:msie\s(\d+\.\d+)\;:9999:9999&mozilla:mozilla\/[5-9]:msie:mozilla\/(\d+\.\d+)\s:9999:1&amaya:amaya:mozilla:V(\d+\.\d+)\s:1:1  PerlSetVar       lonBrowsDet  netscape:mozilla:msie:mozilla\/(\d+\.\d+)\s:9999:9999&explorer:msie:netscape:msie\s(\d+\.\d+)\;:9999:9999&mozilla:mozilla\/[5-9]:msie:mozilla\/(\d+\.\d+)\s:9999:1&amaya:amaya:mozilla:V(\d+\.\d+)\s:1:1
   PerlSetVar       lonTextBrowsers opera:windows\s+ce:lynx
   PerlSetVar       lonScansDir  /home/httpd/scantron
   PerlSetVar       lonScriptTimeout 10
 # -----------------------------------------------------------------------------  # -----------------------------------------------------------------------------
 # NOTE: lonSqlAccess key is the password for the MySQL user  # NOTE: lonSqlAccess key is the password for the MySQL user
 # www@localhost.  This value must always be "localhostkey".  # www@localhost.  This value must always be "localhostkey".
Line 696  PerlSetVar       lonBrowsDet  netscape:m Line 770  PerlSetVar       lonBrowsDet  netscape:m
 PerlSetVar       lonSqlAccess   localhostkey  PerlSetVar       lonSqlAccess   localhostkey
   
 # -----------------------------------------------------------------------------  # -----------------------------------------------------------------------------
   # lonttpdPort is the port used by the lightweight graphics httpd server
   # not the main Apache server
   PerlSetVar       lonhttpdPort  8080
   
   
   
 # ====================================== Include machine-specific configuration  # ====================================== Include machine-specific configuration
Line 705  Include conf/loncapa.conf Line 783  Include conf/loncapa.conf
 # ================================================== Initiate mod_perl starting  # ================================================== Initiate mod_perl starting
   
 PerlRequire      conf/startup.pl  PerlRequire      conf/startup.pl
   <IfDefine !MODPERL2>
 PerlFreshRestart On  PerlFreshRestart On
   </IfDefine>

Removed from v.1.26.2.1  
changed lines
  Added in v.1.48


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>