Changeset 22613

Show
Ignore:
Timestamp:
12.08.2010 17:43:37 (9 years ago)
Author:
ak19
Message:

Still ticket 152: allowing other collectdirs. For the apache web server to display images in a collection, the httpd.conf file must be set up for it

Location:
main/trunk/greenstone2
Files:
2 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone2/gsicontrol.bat

    r20906 r22613  
    233233for /F "delims=*" %%T in ('"echo %GSDLHOME%| bin\windows\sed.exe s@\\@\/@g"') do set safepath=%%T 
    234234 
     235if exist "%GSDLHOME%\cgi-bin\gsdlsite.cfg" FOR /F "tokens=2" %%G IN ('findstr /R ^collecthome "%GSDLHOME%\cgi-bin\gsdlsite.cfg"') do set COLLECTHOME=%%G 
     236if "%COLLECTHOME%" == "" set COLLECTHOME=%GSDLHOME%\collect 
     237for /F "delims=*" %%T in ('"echo %COLLECTHOME%| bin\windows\sed.exe s@\\@\/@g"') do set safecollectpath=%%T 
     238 
     239 
    235240echo Port: %port% 
    236241echo Stopping web server (if running) 
     
    238243if exist "%GSDLHOME%\apache-httpd\%GSDLOS%\conf\httpd.conf" "%GSDLHOME%\bin\windows\stophttpd.exe" %GS2_APACHE_HTTPD_SIGNAL% SILENT 
    239244echo Setting config file to use port %port% 
    240 type "%GSDLHOME%\apache-httpd\%GSDLOS%\conf\httpd.conf.in" | %_sed% "s@\*\*PORT\*\*@%port%@g" | %_sed% "s@\*\*CONNECTPERMISSION\*\*@%allowfromall%@g" | %_sed% "s@\*\*HOST_IP\*\*@%hostIP%@g" | %_sed% "s@\*\*GSDLHOME\*\*@%safepath%@g" | %_sed% "s@\*\*APACHE_HOME_OS\*\*@%safepath%\/apache-httpd\/%GSDLOS%@g" > "%GSDLHOME%\apache-httpd\%GSDLOS%\conf\httpd.conf" 
     245type "%GSDLHOME%\apache-httpd\%GSDLOS%\conf\httpd.conf.in" | %_sed% "s@\*\*PORT\*\*@%port%@g" | %_sed% "s@\*\*CONNECTPERMISSION\*\*@%allowfromall%@g" | %_sed% "s@\*\*HOST_IP\*\*@%hostIP%@g" | %_sed% "s@\*\*COLLECTHOME\*\*@%safecollectpath%@g" | %_sed% "s@\*\*GSDLHOME\*\*@%safepath%@g" | %_sed% "s@\*\*APACHE_HOME_OS\*\*@%safepath%\/apache-httpd\/%GSDLOS%@g" > "%GSDLHOME%\apache-httpd\%GSDLOS%\conf\httpd.conf" 
    241246echo Type '%0 web-start' to start the web server running on port %port% 
    242247echo Done 
  • main/trunk/greenstone2/runtime-src/packages/apache-httpd/windows-httpd.conf.in

    r20634 r22613  
    491491     Allow from 127.0.0.1 **HOST_IP** 
    492492  </Directory> 
     493   
     494  Alias /greenstone/collect "**COLLECTHOME**" 
     495  <Directory "**COLLECTHOME**"> 
     496     Options Indexes MultiViews FollowSymLinks 
     497     AllowOverride None 
     498     Order deny,allow 
     499     **CONNECTPERMISSION** from all 
     500     Allow from 127.0.0.1 **HOST_IP**  
     501  </Directory> 
    493502 
    494503  Alias /greenstone "**GSDLHOME**"