Changeset 23988 for main

Timestamp:

2011-05-04T16:59:30+12:00 (13 years ago)

Author:

ak19

Message:

In gs2-server.sh, no longer redirecting stderr of call call to gsicontrol.sh reset-gsdlhome into the void, only the stdout. This means that the invalid port value found in httpd.conf when web-stop-tested is called by configure-apache (the value is the placeholder string PORT at this stage), is handled differently.

Location:

main/trunk/greenstone2

Files:

• gs2-server.sh (modified) (1 diff)
• gsicontrol.sh (modified) (3 diffs)

main/trunk/greenstone2/gs2-server.sh

@@ -153 +153 @@
     fi
 
-    # whenever the server is started up, make sure gsdlhome is correct (in case the install was moved).
-    # Need to redirect both stderr and stdout (with &>) into the void, since reset-gsdlhome makes 
-    # web-stop-tested output an "error" as there's no httpd.conf.in at the stage when web-stop is called.
+    # whenever the server is started up, make sure gsdlhome is correct (in case the gs install was moved).
+    # If both stderr and stdout need to be redirected into the void (with &>/dev/null), see
     # http://linuxwave.blogspot.com/2008/03/redirecting-stdout-and-stderr.html
-    ./gsicontrol.sh reset-gsdlhome &>/dev/null
+    ./gsicontrol.sh reset-gsdlhome >/dev/null
 
     if [ "x$silent" == "x" -o "x$silent" != "xtrue" ]; then 

main/trunk/greenstone2/gsicontrol.sh

@@ -39 +39 @@
     echo "# **** This file is automatically generated, do not edit ****" > "$cgibin/gsdlsite.cfg" ;
     echo "# For local customization of Greenstone, edit gsdlsite.cfg.in" >> "$cgibin/gsdlsite.cfg" ;
+    echo "" >> "$cgibin/gsdlsite.cfg" ;
     sed "s@\*\*GSDLHOME\*\*@$GSDLHOME@g" "$cgibin/gsdlsite.cfg.in" >> "$cgibin/gsdlsite.cfg" ;
     else
@@ -94 +95 @@
     if test ! -z $port ; then
     echo "Port: $port" ;
-    echo "Stopping web server (if running)" ;
-    web-stop-tested ;
+# if called by reset-gsdlhome, then httpd.conf file was regenerated by install-bindist.sh script and
+# contains placeholder strings, including for Listen port. So can't stop web-server in such a case.
+    if test -e "$GSDLHOME/apache-httpd/$GSDLOS$GSDLARCH/conf/httpd.conf" ; then
+        confport=`egrep "^Listen" $GSDLHOME/apache-httpd/$GSDLOS$GSDLARCH/conf/httpd.conf | awk '{print $2}'` ;
+        if [ "$confport" != "**PORT**" ] ; then 
+        echo "Stopping web server (if running)" ;
+        web-stop-tested ;
+        fi
+    fi
     echo "Setting config file to use port $port";
     cat "$GSDLHOME/apache-httpd/$GSDLOS$GSDLARCH/conf/httpd.conf.in" \
@@ -215 +223 @@
     
     /bin/cp "$apache_home_os/build/config_vars.mk.in" "$apache_home_os/build/config_vars.mk"
-    
+
+# replace template files with active versions. The following will generate a httpd.conf
+# file with placeholder strings, all of which we'll replace shortly hereafter.
     bash "$apache_home_os/install-bindist.sh" "$apache_home_os"