Diff for /loncom/loncapa_apache.conf between versions 1.197 and 1.211

version 1.197, 2010/08/10 14:30:28 version 1.211, 2012/02/28 15:14:25
Line 38  ExtendedStatus On Line 38  ExtendedStatus On
 Alias /zipspool/ /home/httpd/zipspool/  Alias /zipspool/ /home/httpd/zipspool/
 Alias /prtspool/ /home/httpd/prtspool/  Alias /prtspool/ /home/httpd/prtspool/
 Alias /captchaspool/ /home/httpd/captchaspool/  Alias /captchaspool/ /home/httpd/captchaspool/
   Alias /webdav/ /home/httpd/html/priv/
 ScriptAlias /cgi-bin/ "/home/httpd/cgi-bin/"  ScriptAlias /cgi-bin/ "/home/httpd/cgi-bin/"
   DAVLockDB /home/httpd/webdav/DAVLock
   
 # ================================================================= Directories  # ================================================================= Directories
   
Line 59  PerlAuthenHandler 'sub { return OK }' Line 61  PerlAuthenHandler 'sub { return OK }'
 <LocationMatch "^(/adm/lonIcons|/adm/jQuery|/adm/jsMath|/res/adm/pages|/ckeditor)">  <LocationMatch "^(/adm/lonIcons|/adm/jQuery|/adm/jsMath|/res/adm/pages|/ckeditor)">
         ExpiresActive On          ExpiresActive On
         ExpiresDefault "access plus 12 hours"          ExpiresDefault "access plus 12 hours"
           Header set Cache-Control "public, no-transform"
 </LocationMatch>  </LocationMatch>
   
 <LocationMatch "^/+res.*">  <LocationMatch "^/+res.*">
Line 257  ErrorDocument     406 /adm/notinit.html Line 260  ErrorDocument     406 /adm/notinit.html
 ErrorDocument  500 /adm/errorhandler  ErrorDocument  500 /adm/errorhandler
 </LocationMatch>  </LocationMatch>
   
 <LocationMatch "^/+priv.*">  <LocationMatch "^/+priv/.*">
 AuthType LONCAPA  AuthType LONCAPA
 Require valid-user  Require valid-user
 PerlAuthzHandler Apache::loncacc  PerlAuthzHandler Apache::loncacc
 SetHandler        perl-script  SetHandler        perl-script
 PerlHandler       Apache::lonconstruct  
 ErrorDocument     403 /adm/login  ErrorDocument     403 /adm/login
 ErrorDocument     404 /adm/notfound.html  ErrorDocument     404 /adm/notfound.html
 ErrorDocument     406 /adm/unauthorized  ErrorDocument     406 /adm/unauthorized
 ErrorDocument  500 /adm/errorhandler  ErrorDocument  500 /adm/errorhandler
 </LocationMatch>  </LocationMatch>
   
 <LocationMatch "^/+raw.*">  <LocationMatch "^/+webdav/[\w\-]+/[\w\-]+/">
 PerlAccessHandler Apache::lonracc    <IfModule mod_ssl.c>
       AuthType Basic
       AuthName "LONCAPA username,domain"
       Require valid-user
       SSLRequireSSL
       PerlAuthenHandler Apache::lonwebdavauth
       PerlAuthzHandler Apache::lonwebdavacc
       Dav On
       DirectoryIndex index.missing
       Options Indexes FollowSymLinks
       ErrorDocument     403 /adm/nowebdav.html
       ErrorDocument     404 /adm/notfound.html
       ErrorDocument     406 /adm/unauthorized
       ErrorDocument     500 /adm/errorhandler
     </IfModule>
     <IfModule !mod_ssl.c>
       <IfModule mod_rewrite.c>
           RewriteEngine on
           RewriteRule .* http://%{HTTP_HOST}/adm/nowebdav.html [L]
       </IfModule>
     </IfModule>
 </LocationMatch>  </LocationMatch>
   
 <LocationMatch "^/+\~.*">  <LocationMatch "^/+raw.*">
 AuthType LONCAPA  PerlAccessHandler Apache::lonracc
 Require valid-user  
 PerlAuthzHandler Apache::loncacc  
 ErrorDocument     403 /adm/login  
 ErrorDocument     404 /adm/notfound.html  
 ErrorDocument     406 /adm/unauthorized  
 ErrorDocument  500 /adm/errorhandler  
 </LocationMatch>  </LocationMatch>
   
 <LocationMatch "^/adm/helper/.*\.helper$">  <LocationMatch "^/adm/helper/.*\.helper$">
Line 318  ErrorDocument   500 /adm/errorhandler Line 334  ErrorDocument   500 /adm/errorhandler
 </LocationMatch>  </LocationMatch>
 # ------------------------------------------------------------------------- RAT  # ------------------------------------------------------------------------- RAT
   
 <LocationMatch "^/\~.*\.sequence$">  <LocationMatch "^/+priv/.*\.sequence$">
 SetHandler perl-script  SetHandler perl-script
 PerlHandler Apache::lonratedt  PerlHandler Apache::lonratedt
 </LocationMatch>  </LocationMatch>
   
 <LocationMatch "^/\~.*\.page$">  <LocationMatch "^/+priv/.*\.page$">
 SetHandler perl-script  SetHandler perl-script
 PerlHandler Apache::lonratedt  PerlHandler Apache::lonratedt
 </LocationMatch>  </LocationMatch>
   
 <LocationMatch "^/\~.*\/ratserver$">  <LocationMatch "^/+priv/.*\/ratserver$">
 SetHandler perl-script  SetHandler perl-script
 PerlHandler Apache::lonratsrv  PerlHandler Apache::lonratsrv
 </LocationMatch>  </LocationMatch>
   
 <LocationMatch "^/\~.*\/adveditmenu$">  <LocationMatch "^/+priv/.*\/adveditmenu$">
 SetHandler perl-script  SetHandler perl-script
 PerlHandler Apache::lonratmenu  PerlHandler Apache::lonratmenu
 </LocationMatch>  </LocationMatch>
Line 372  SetHandler perl-script Line 388  SetHandler perl-script
 PerlHandler Apache::lonsequence  PerlHandler Apache::lonsequence
 </LocationMatch>  </LocationMatch>
   
 <LocationMatch "^/+(res|\~|public|uploaded|editupload|adm).*\.meta$">  <LocationMatch "^/+(res|priv|public|uploaded|editupload|adm)/.*\.meta$">
 PerlAccessHandler      Apache::publiccheck  PerlAccessHandler      Apache::publiccheck
 SetHandler perl-script  SetHandler perl-script
 PerlHandler Apache::lonmeta  PerlHandler Apache::lonmeta
Line 389  PerlHandler Apache::lonmeta Line 405  PerlHandler Apache::lonmeta
   
   
   
 <LocationMatch "^/+(res|\~).*\.rights$">  <LocationMatch "^/+(res|priv)/.*\.rights$">
 SetHandler perl-script  SetHandler perl-script
 PerlHandler Apache::lonrights  PerlHandler Apache::lonrights
 </LocationMatch>  </LocationMatch>
   
 <LocationMatch "^/+(uploaded|res|\~).*\.(xml|html|htm|xhtml|xhtm|sty)$">  <LocationMatch "^/+(uploaded|res|priv)/.*\.(xml|html|htm|xhtml|xhtm|sty)$">
 SetHandler perl-script  SetHandler perl-script
 PerlHandler Apache::londatecheck  PerlHandler Apache::londatecheck
 PerlHandler Apache::lonipcheck  PerlHandler Apache::lonipcheck
 PerlHandler Apache::lonxml  PerlHandler Apache::lonxml
 </LocationMatch>  </LocationMatch>
   
 <LocationMatch "^/+(res|\~).*\.(task|problem|exam|quiz|assess|survey|form|library)$">  <LocationMatch "^/+(res|priv).*\.(task|problem|exam|quiz|assess|survey|form|library)$">
 SetHandler perl-script  SetHandler perl-script
 PerlHandler Apache::lonhomework  PerlHandler Apache::lonhomework
 </LocationMatch>  </LocationMatch>
   
 <LocationMatch "^/+\~.*\.(js|css|txt|tex)$">  <LocationMatch "^/+priv/.*\.(js|css|txt|tex)$">
 SetHandler perl-script  SetHandler perl-script
 PerlHandler Apache::lonxml  PerlHandler Apache::lonxml
 </LocationMatch>  </LocationMatch>
Line 467  ErrorDocument     403 /adm/login Line 483  ErrorDocument     403 /adm/login
 ErrorDocument  500 /adm/errorhandler  ErrorDocument  500 /adm/errorhandler
 </Location>  </Location>
   
   <Location /adm/searchcourse>
   AuthType LONCAPA
   Require valid-user
   PerlAuthzHandler       Apache::lonacc
   SetHandler perl-script
   PerlHandler Apache::lonsearchcourse
   ErrorDocument     403 /adm/login
   ErrorDocument     500 /adm/errorhandler
   </Location>
   
   <Location /adm/indexcourse>
   AuthType LONCAPA
   Require valid-user
   PerlAuthzHandler       Apache::lonacc
   SetHandler perl-script
   PerlHandler Apache::lonindexcourse
   ErrorDocument     403 /adm/login
   ErrorDocument     500 /adm/errorhandler
   </Location>
   
 <Location /adm/statistics>  <Location /adm/statistics>
 AuthType LONCAPA  AuthType LONCAPA
 Require valid-user  Require valid-user
Line 510  ErrorDocument     403 /adm/login Line 546  ErrorDocument     403 /adm/login
 ErrorDocument  500 /adm/errorhandler  ErrorDocument  500 /adm/errorhandler
 </Location>  </Location>
   
   <Location /adm/pickresource>
   AuthType LONCAPA
   Require valid-user
   PerlAuthzHandler       Apache::lonacc
   SetHandler perl-script
   PerlHandler Apache::lonpickresource
   ErrorDocument     403 /adm/login
   ErrorDocument     500 /adm/errorhandler
   </Location>
   
 <Location /adm/pickauthor>  <Location /adm/pickauthor>
 AuthType LONCAPA  AuthType LONCAPA
 Require valid-user  Require valid-user
Line 637  ErrorDocument     403 /adm/login Line 683  ErrorDocument     403 /adm/login
 ErrorDocument  500 /adm/errorhandler  ErrorDocument  500 /adm/errorhandler
 </Location>  </Location>
   
 <Location /adm/bookmarks>  
 AuthType LONCAPA  
 Require valid-user  
 PerlAuthzHandler       Apache::lonacc  
 SetHandler perl-script  
 PerlHandler Apache::admbookmarks  
 ErrorDocument     403 /adm/login  
 ErrorDocument  500 /adm/errorhandler  
 </Location>  
   
 <Location /adm/flip>  <Location /adm/flip>
 AuthType LONCAPA  AuthType LONCAPA
 Require valid-user  Require valid-user
Line 823  ErrorDocument     406 /adm/unauthorized Line 859  ErrorDocument     406 /adm/unauthorized
 ErrorDocument  500 /adm/errorhandler  ErrorDocument  500 /adm/errorhandler
 </Location>  </Location>
   
 <LocationMatch "^/+\~.*/$">  <LocationMatch "^/+priv/.*/$">
 AuthType LONCAPA  AuthType LONCAPA
 Require valid-user  Require valid-user
 PerlAuthzHandler       Apache::loncacc  PerlAuthzHandler       Apache::loncacc
Line 835  ErrorDocument     406 /adm/unauthorized Line 871  ErrorDocument     406 /adm/unauthorized
 ErrorDocument  500 /adm/errorhandler  ErrorDocument  500 /adm/errorhandler
 </LocationMatch>  </LocationMatch>
   
 <Location /adm/pubdir>  
 AuthType LONCAPA  
 Require valid-user  
 PerlAuthzHandler       Apache::lonacc  
 SetHandler perl-script  
 PerlHandler Apache::lonpubdir  
 ErrorDocument     403 /adm/login  
 ErrorDocument     404 /adm/notfound.html  
 ErrorDocument     406 /adm/unauthorized  
 ErrorDocument  500 /adm/errorhandler  
 </Location>  
   
 <Location /adm/unauthorized>  <Location /adm/unauthorized>
 AuthType LONCAPA  AuthType LONCAPA
 Require valid-user  Require valid-user
Line 1099  ErrorDocument     403 /adm/login Line 1123  ErrorDocument     403 /adm/login
 ErrorDocument  500 /adm/errorhandler  ErrorDocument  500 /adm/errorhandler
 </Location>  </Location>
   
   <Location /adm/supplemental>
   AuthType LONCAPA
   Require valid-user
   PerlAuthzHandler       Apache::lonacc
   SetHandler perl-script
   PerlHandler Apache::londocs
   PerlCleanupHandler Apache::londocs::untiehash
   PerlCleanupHandler      Apache::lonacc::cleanup
   ErrorDocument     403 /adm/login
   ErrorDocument     500 /adm/errorhandler
   </Location>
   
 <Location /adm/imsimportdocs>  <Location /adm/imsimportdocs>
 AuthType LONCAPA  AuthType LONCAPA
 Require valid-user  Require valid-user
Line 1230  AuthType LONCAPA Line 1266  AuthType LONCAPA
 Require valid-user  Require valid-user
 PerlAuthzHandler       Apache::lonacc  PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script  SetHandler perl-script
 PerlHandler Apache::lonwishlist  PerlHandler Apache::lonwishlistdisplay
 ErrorDocument     403 /adm/login  ErrorDocument     403 /adm/login
 ErrorDocument     406 /adm/roles  ErrorDocument     406 /adm/roles
 ErrorDocument  500 /adm/errorhandler  ErrorDocument  500 /adm/errorhandler
 </Location>  </Location>
   
   <Location /adm/setblock>
   AuthType LONCAPA
   Require valid-user
   PerlAuthzHandler       Apache::lonacc
   SetHandler             perl-script
   PerlHandler            Apache::lonblockingmenu
   ErrorDocument     403 /adm/login
   ErrorDocument     406 /adm/roles
   ErrorDocument     500 /adm/errorhandler
   </Location>
   
 <Location /adm/blockingstatus>  <Location /adm/blockingstatus>
 PerlAccessHandler      Apache::publiccheck  PerlAccessHandler      Apache::publiccheck
 AuthType LONCAPA  AuthType LONCAPA
Line 1438  Options Indexes FollowSymLinks Line 1485  Options Indexes FollowSymLinks
   
 PerlSetVar lonVersion   '<!-- VERSION -->'  PerlSetVar lonVersion   '<!-- VERSION -->'
 PerlSetVar       lonIDsDir    /home/httpd/lonIDs  PerlSetVar       lonIDsDir    /home/httpd/lonIDs
   PerlSetVar       lonDAVsessDir /home/httpd/webdav/sessionIDs
 PerlSetVar       lonTabDir    /home/httpd/lonTabs  PerlSetVar       lonTabDir    /home/httpd/lonTabs
 PerlSetVar       lonUsersDir  /home/httpd/lonUsers  PerlSetVar       lonUsersDir  /home/httpd/lonUsers
 PerlSetVar       lonIconsURL  /adm/lonIcons  PerlSetVar       lonIconsURL  /adm/lonIcons
Line 1548  PerlSetVar SSLEmail     certificate@lon- Line 1596  PerlSetVar SSLEmail     certificate@lon-
 #-------------------------------------------------------------------------  #-------------------------------------------------------------------------
   
   
   # ====================================== Include support for SSL rewrites
   
   Include conf/loncapa_rewrite.conf
   
   
 # ====================================== Include machine-specific configuration  # ====================================== Include machine-specific configuration

Removed from v.1.197  
changed lines
  Added in v.1.211


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