Changeset 26978

Show
Ignore:
Timestamp:
04.03.2013 19:46:28 (7 years ago)
Author:
ak19
Message:

Third and final commit for RSS support. This time the windows-httpd.conf.in is also updated with the Rewrite rules for pretty URLs. For this to work, windows needs to load the rewrite module so file as well, so that LoadModule? line is uncommented. Fortunately, it was already being compiled up by default for Windows.

Location:
main/trunk/greenstone2/runtime-src/packages/apache-httpd
Files:
2 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone2/runtime-src/packages/apache-httpd/httpd.conf.in

    r26977 r26978  
    418418</IfModule> 
    419419 
     420 
    420421  ScriptAlias /greenstone/cgi-bin "**GSDLHOME**/cgi-bin/**GSDL_OS_ARCH**" 
    421422  <Directory "**GSDLHOME**/cgi-bin/**GSDL_OS_ARCH**"> 
     
    436437 
    437438     RewriteEngine On 
    438      RewriteRule ^([A-Za-z0-9-]+)/about/?$         /greenstone/cgi-bin/library.\ 
    439 cgi?c=$1&a=p&p=about [L] 
    440      RewriteRule ^([A-Za-z0-9-]+)/query/?$         /greenstone/cgi-bin/library.\ 
    441 cgi?c=$1&a=q [L] 
    442      RewriteRule ^([A-Za-z0-9-]+)/document/([^/]+)$  /greenstone/cgi-bin/librar\ 
    443 y.cgi?c=$1&a=d&d=$2 [L] 
    444      RewriteRule ^([A-Za-z0-9-]+)/document/(.*?)/(.*)$  /greenstone/cgi-bin/lib\ 
    445 rary.cgi?c=$1&a=d&d=$2&$3 [L] 
    446      RewriteRule ^([A-Za-z0-9-]+)/$                /greenstone/cgi-bin/library.\ 
    447 cgi?c=$1&a=p&p=about [L] 
     439     RewriteRule ^([A-Za-z0-9-]+)/about/?$         /greenstone/cgi-bin/library.cgi?c=$1&a=p&p=about [L] 
     440     RewriteRule ^([A-Za-z0-9-]+)/query/?$         /greenstone/cgi-bin/library.cgi?c=$1&a=q [L] 
     441     RewriteRule ^([A-Za-z0-9-]+)/document/([^/]+)$  /greenstone/cgi-bin/library.cgi?c=$1&a=d&d=$2 [L] 
     442     RewriteRule ^([A-Za-z0-9-]+)/document/(.*?)/(.*)$  /greenstone/cgi-bin/library.cgi?c=$1&a=d&d=$2&$3 [L] 
     443     RewriteRule ^([A-Za-z0-9-]+)/$                /greenstone/cgi-bin/library.cgi?c=$1&a=p&p=about [L] 
    448444     # RewriteRule ^([A-Za-z0-9-]+)/(.*?)$         /greenstone/cgi-bin/library.cgi?c=$1&$2 [L] 
    449  
    450445  </Directory>   
    451446   
  • main/trunk/greenstone2/runtime-src/packages/apache-httpd/windows-httpd.conf.in

    r26543 r26978  
    127127#LoadModule proxy_ftp_module modules/mod_proxy_ftp.so 
    128128#LoadModule proxy_http_module modules/mod_proxy_http.so 
    129 #LoadModule rewrite_module modules/mod_rewrite.so 
     129LoadModule rewrite_module modules/mod_rewrite.so 
    130130LoadModule setenvif_module modules/mod_setenvif.so 
    131131#LoadModule speling_module modules/mod_speling.so 
     
    512512     **CONNECTPERMISSION** from all 
    513513     Allow from 127.0.0.1 **HOST_IP** **HOSTS** localhost  
     514      
     515     RewriteEngine On 
     516     RewriteRule ^([A-Za-z0-9-]+)/about/?$         /greenstone/cgi-bin/library.cgi?c=$1&a=p&p=about [L] 
     517     RewriteRule ^([A-Za-z0-9-]+)/query/?$         /greenstone/cgi-bin/library.cgi?c=$1&a=q [L] 
     518     RewriteRule ^([A-Za-z0-9-]+)/document/([^/]+)$  /greenstone/cgi-bin/library.cgi?c=$1&a=d&d=$2 [L] 
     519     RewriteRule ^([A-Za-z0-9-]+)/document/(.*?)/(.*)$  /greenstone/cgi-bin/library.cgi?c=$1&a=d&d=$2&$3 [L] 
     520     RewriteRule ^([A-Za-z0-9-]+)/$                /greenstone/cgi-bin/library.cgi?c=$1&a=p&p=about [L] 
     521     # RewriteRule ^([A-Za-z0-9-]+)/(.*?)$         /greenstone/cgi-bin/library.cgi?c=$1&$2 [L] 
    514522  </Directory> 
    515523