Changeset 22635

Timestamp:

2010-08-13T20:33:12+12:00 (14 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:

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

main/trunk/greenstone2/gsicontrol.sh

@@ -69 +69 @@
     fi
 
+    if test -e $GSDLHOME/cgi-bin/gsdlsite.cfg ; then
+    collecthome=`egrep "^collecthome" $GSDLHOME/cgi-bin/gsdlsite.cfg | awk '{print $2}'` ;
+    fi
+    if test -z $collecthome ; then
+    collecthome="$GSDLHOME/collect" ;
+    fi
+
     if test ! -z $port ; then
     echo "Port: $port" ;
@@ -78 +85 @@
     | sed "s@\*\*CONNECTPERMISSION\*\*@$allowfromall@g" \
     | sed "s@\*\*HOST_IP\*\*@$hostIP@g" \
+    | sed "s@\*\*COLLECTHOME\*\*@$collecthome@g" \
     | sed "s@\*\*GSDLHOME\*\*@$GSDLHOME@g" \
     | sed "s@\*\*APACHE_HOME_OS\*\*@$GSDLHOME/apache-httpd/$GSDLOS@g" \

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

@@ -426 +426 @@
      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**"