Changeset 22613

Timestamp:

2010-08-12T17:43:37+12:00 (14 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:

• gsicontrol.bat (modified) (2 diffs)
• runtime-src/packages/apache-httpd/windows-httpd.conf.in (modified) (1 diff)

main/trunk/greenstone2/gsicontrol.bat

@@ -233 +233 @@
 for /F "delims=*" %%T in ('"echo %GSDLHOME%| bin\windows\sed.exe s@\\@\/@g"') do set safepath=%%T
 
+if exist "%GSDLHOME%\cgi-bin\gsdlsite.cfg" FOR /F "tokens=2" %%G IN ('findstr /R ^collecthome "%GSDLHOME%\cgi-bin\gsdlsite.cfg"') do set COLLECTHOME=%%G
+if "%COLLECTHOME%" == "" set COLLECTHOME=%GSDLHOME%\collect
+for /F "delims=*" %%T in ('"echo %COLLECTHOME%| bin\windows\sed.exe s@\\@\/@g"') do set safecollectpath=%%T
+
+
 echo Port: %port%
 echo Stopping web server (if running)
@@ -238 +243 @@
 if exist "%GSDLHOME%\apache-httpd\%GSDLOS%\conf\httpd.conf" "%GSDLHOME%\bin\windows\stophttpd.exe" %GS2_APACHE_HTTPD_SIGNAL% SILENT
 echo Setting config file to use port %port%
-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"
+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@\*\*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"
 echo Type '%0 web-start' to start the web server running on port %port%
 echo Done

main/trunk/greenstone2/runtime-src/packages/apache-httpd/windows-httpd.conf.in

@@ -491 +491 @@
      Allow from 127.0.0.1 **HOST_IP**
   </Directory>
+  
+  Alias /greenstone/collect "**COLLECTHOME**"
+  <Directory "**COLLECTHOME**">
+     Options Indexes MultiViews FollowSymLinks
+     AllowOverride None
+     Order deny,allow
+     **CONNECTPERMISSION** from all
+     Allow from 127.0.0.1 **HOST_IP** 
+  </Directory>
 
   Alias /greenstone "**GSDLHOME**"