Changeset 22635

Show
Ignore:
Timestamp:
13.08.2010 20:33:12 (9 years ago)
Author:
ak19
Message:

3rd commit to do with having a relocatable collect dir. Changes to linux script and conf file (windows already changed in 2nd commit): Apache-httpd's conf file needs to have a collecthome alias section. GSI-control.sh writes in the value taken from gsdlsite.cfg.

Location:
main/trunk/greenstone2
Files:
2 modified

Legend:

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

    r20919 r22635  
    6969    fi 
    7070 
     71    if test -e $GSDLHOME/cgi-bin/gsdlsite.cfg ; then 
     72    collecthome=`egrep "^collecthome" $GSDLHOME/cgi-bin/gsdlsite.cfg | awk '{print $2}'` ; 
     73    fi 
     74    if test -z $collecthome ; then 
     75    collecthome="$GSDLHOME/collect" ; 
     76    fi 
     77 
    7178    if test ! -z $port ; then 
    7279    echo "Port: $port" ; 
     
    7885    | sed "s@\*\*CONNECTPERMISSION\*\*@$allowfromall@g" \ 
    7986    | sed "s@\*\*HOST_IP\*\*@$hostIP@g" \ 
     87    | sed "s@\*\*COLLECTHOME\*\*@$collecthome@g" \ 
    8088    | sed "s@\*\*GSDLHOME\*\*@$GSDLHOME@g" \ 
    8189    | sed "s@\*\*APACHE_HOME_OS\*\*@$GSDLHOME/apache-httpd/$GSDLOS@g" \ 
  • main/trunk/greenstone2/runtime-src/packages/apache-httpd/httpd.conf.in

    r21810 r22635  
    426426     Allow from 127.0.0.1 **HOST_IP** 
    427427  </Directory> 
     428 
     429  Alias /greenstone/collect "**COLLECTHOME**" 
     430  <Directory "**COLLECTHOME**"> 
     431     Options Indexes MultiViews FollowSymLinks 
     432     AllowOverride None 
     433     Order deny,allow 
     434     **CONNECTPERMISSION** from all 
     435     Allow from 127.0.0.1 **HOST_IP**  
     436  </Directory>   
    428437   
    429438  Alias /greenstone "**GSDLHOME**"