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

version 1.211, 2012/02/28 15:14:25 version 1.220, 2012/12/14 23:03:17
Line 40  Alias /prtspool/ /home/httpd/prtspool/ Line 40  Alias /prtspool/ /home/httpd/prtspool/
 Alias /captchaspool/ /home/httpd/captchaspool/  Alias /captchaspool/ /home/httpd/captchaspool/
 Alias /webdav/ /home/httpd/html/priv/  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  <IfModule mod_dav_fs.c>
       DAVLockDB /home/httpd/webdav/DAVLock
   </IfModule>
   
 # ================================================================= Directories  # ================================================================= Directories
   
Line 52  PerlCleanupHandler Apache::lonacc::clean Line 54  PerlCleanupHandler Apache::lonacc::clean
 PerlAuthenHandler Apache::checkauthen  PerlAuthenHandler Apache::checkauthen
 PerlSetVar lonOtherAuthen no  PerlSetVar lonOtherAuthen no
   
   <IfModule mod_shib>
       PerlAuthenHandler Apache::lonshibauth
       PerlSetVar lonOtherAuthen yes
       PerlSetVar lonOtherAuthenType Shibboleth
   </IfModule>
   
 #PerlWarn On  #PerlWarn On
 <LocationMatch "^/+res/adm/pages/[^/]+\.(gif|png)$">  <LocationMatch "^/+res/adm/pages/[^/]+\.(gif|png)$">
 PerlAuthenHandler 'sub { return OK }'   PerlAuthenHandler 'sub { return OK }' 
Line 272  ErrorDocument   500 /adm/errorhandler Line 280  ErrorDocument   500 /adm/errorhandler
 </LocationMatch>  </LocationMatch>
   
 <LocationMatch "^/+webdav/[\w\-]+/[\w\-]+/">  <LocationMatch "^/+webdav/[\w\-]+/[\w\-]+/">
   <IfModule mod_ssl.c>    <IfModule mod_dav.c>
     AuthType Basic      <IfModule mod_ssl.c>
     AuthName "LONCAPA username,domain"        AuthType Basic
     Require valid-user        AuthName "LONCAPA username,domain"
     SSLRequireSSL        Require valid-user
     PerlAuthenHandler Apache::lonwebdavauth        SSLRequireSSL
     PerlAuthzHandler Apache::lonwebdavacc        PerlAuthenHandler Apache::lonwebdavauth
     Dav On        PerlAuthzHandler Apache::lonwebdavacc
     DirectoryIndex index.missing        Dav On
     Options Indexes FollowSymLinks        DirectoryIndex index.missing
     ErrorDocument     403 /adm/nowebdav.html        Options Indexes FollowSymLinks
     ErrorDocument     404 /adm/notfound.html        ErrorDocument     403 /adm/nowebdav.html
     ErrorDocument     406 /adm/unauthorized        ErrorDocument     404 /adm/notfound.html
     ErrorDocument     500 /adm/errorhandler        ErrorDocument     406 /adm/unauthorized
   </IfModule>        ErrorDocument     500 /adm/errorhandler
   <IfModule !mod_ssl.c>      </IfModule>
     <IfModule mod_rewrite.c>      <IfModule !mod_ssl.c>
         <IfModule mod_rewrite.c>
         RewriteEngine on          RewriteEngine on
         RewriteRule .* http://%{HTTP_HOST}/adm/nowebdav.html [L]          RewriteRule .* http://%{HTTP_HOST}/adm/nowebdav.html [L]
         </IfModule>
       </IfModule>
     </IfModule>
     <IfModule !mod_dav.c>
       <IfModule mod_rewrite.c>
         RewriteEngine on
         RewriteRule .* http://%{HTTP_HOST}/adm/nowebdav.html [L]
     </IfModule>      </IfModule>
   </IfModule>    </IfModule>
 </LocationMatch>  </LocationMatch>
Line 607  ErrorDocument     403 /adm/login Line 623  ErrorDocument     403 /adm/login
 ErrorDocument  500 /adm/errorhandler  ErrorDocument  500 /adm/errorhandler
 </Location>  </Location>
   
   <Location /adm/dependencies>
   AuthType LONCAPA
   Require valid-user
   PerlAuthzHandler       Apache::lonacc
   SetHandler perl-script
   PerlHandler Apache::londependencies
   ErrorDocument     403 /adm/login
   ErrorDocument     406 /adm/roles
   ErrorDocument     500 /adm/errorhandler
   </Location>
   
 <Location /adm/login>  <Location /adm/login>
 SetHandler perl-script  SetHandler perl-script
 PerlHandler Apache::lonlogin  PerlHandler Apache::lonlogin
Line 663  SetHandler perl-script Line 690  SetHandler perl-script
 PerlHandler Apache::migrateuser  PerlHandler Apache::migrateuser
 </Location>  </Location>
   
   <Location /adm/sso>
     <IfModule mod_shib>
       AuthType shibboleth
       ShibUseEnvironment On
       ShibRequestSetting requireSession 1
       ShibRequestSetting redirectToSSL 443
       require valid-user
       PerlAuthzHandler       Apache::lonshibacc
       PerlAuthzHandler       Apache::lonacc
     </IfModule>
     <IfModule !mod_shib>
       PerlTypeHandler        Apache::lonnoshib
     </IfModule>
   </Location>
   
 <Location /adm/annotations>  <Location /adm/annotations>
 AuthType LONCAPA  AuthType LONCAPA
 Require valid-user  Require valid-user
Line 1367  PerlHandler Apache::londns Line 1409  PerlHandler Apache::londns
 ErrorDocument     500 /adm/errorhandler  ErrorDocument     500 /adm/errorhandler
 </LocationMatch>  </LocationMatch>
   
   <LocationMatch "^/ajax/spellcheck">
   SetHandler perl-script
   PerlHandler Apache::spellcheck
   </LocationMatch>
   
   
   
 # ------------------------------------------------- Backdoor Adm Tests/Programs  # ------------------------------------------------- Backdoor Adm Tests/Programs
   
 <Location /adm/test>  <Location /adm/test>
Line 1483  Options Indexes FollowSymLinks Line 1532  Options Indexes FollowSymLinks
 # ******** THESE "SHOULD" NEVER BE ALTERED BY THE USER ************************  # ******** THESE "SHOULD" NEVER BE ALTERED BY THE USER ************************
 # ====================================== Internal Settings / Perl Configuration  # ====================================== Internal Settings / Perl Configuration
   
 PerlSetVar lonVersion   '<!-- VERSION -->'  PerlSetVar lonVersion  '<!-- VERSION -->'
 PerlSetVar       lonIDsDir    /home/httpd/lonIDs  PerlSetVar       lonIDsDir    /home/httpd/lonIDs
 PerlSetVar       lonDAVsessDir /home/httpd/webdav/sessionIDs  PerlSetVar       lonDAVsessDir /home/httpd/webdav/sessionIDs
 PerlSetVar       lonTabDir    /home/httpd/lonTabs  PerlSetVar       lonTabDir    /home/httpd/lonTabs
Line 1510  PerlSetVar       lonFontsDir     /home/h Line 1559  PerlSetVar       lonFontsDir     /home/h
 # - a number that describes the minimum version that has mathml support  # - a number that describes the minimum version that has mathml support
 # - a number that describes the minimum number version that has unicode support  # - a number that describes the minimum number version that has unicode support
   
 PerlSetVar       lonBrowsDet  explorer:msie:netscape:msie\s(\d+\.\d+)\;:9999:5&mozilla:mozilla\/[5-9]:msie:mozilla\/(\d+\.\d+)\s:9999:1&netscape:netscape:msie:netscape\/(\d+\.\d+):9999:7&netscape:netscape\/[7-9]:shouldnotmatch:netscape\/(\d+\.\d+):9999:7&amaya:amaya:mozilla:V(\d+\.\d+)\s:1:1&safari:safari:msie:safari\/([\d\.]+):9999:84  PerlSetVar       lonBrowsDet  explorer:msie:netscape:msie\s(\d+\.\d+)\;:9999:5&mozilla:mozilla\/[5-9]:msie:mozilla\/(\d+\.\d+)\s:9999:1&netscape:netscape:msie:netscape\/(\d+\.\d+):9999:7&netscape:netscape\/[7-9]:shouldnotmatch:netscape\/(\d+\.\d+):9999:7&amaya:amaya:mozilla:V(\d+\.\d+)\s:1:1&safari:safari:msie:safari\/([\d\.]+):9999:84&chrome:chrome:shouldnotmatch:chrome\/(\d+\.\d+):9999:1
   
 PerlSetVar       lonTextBrowsers windows\s+ce:lynx  PerlSetVar       lonTextBrowsers windows\s+ce:lynx
 PerlSetVar       lonScansDir  /home/httpd/scantron  PerlSetVar       lonScansDir  /home/httpd/scantron

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


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