Changeset 20619

Timestamp:

2009-09-17T16:28:21+12:00 (15 years ago)

Author:

ak19

Message:

1. Changes to get localhost to be recognised on Linux and the hostname to be recognised on Windows. Multiple allowed host values are inserted into the configfile (e.g. llssite.cfg) and these are used in httpd.conf. 2. Fixed errors: the Address Resolution Method part of the GSI dialog should not be deactivated when the Allow External Connections is checked.

Location:

gsdl/trunk

Files:

• glisite.cfg.in (modified) (1 diff)
• gsicontrol.sh (modified) (5 diffs)
• lib/java/server.jar (modified) ( previous)
• lib/java/server.properties (modified) (1 diff)
• llssite.cfg.in (modified) (1 diff)

gsdl/trunk/glisite.cfg.in

@@ -9 +9 @@
 start_browser=0
 address_resolution_method=2
-host=localhost
+hosts=127.0.0.1 localhost
+hostIP=127.0.0.1

gsdl/trunk/gsicontrol.sh

@@ -49 +49 @@
 
 
-function _configure-port-and-connection {
-    test-gsdlhome
+function configure-port-and-connection {
+    test-gsdlhome
+    configfile=$1 ;
+# if no configfile given, launch it with llssite.cfg. Create it from the template if needed.
+    if [ "x$configfile" = "x" ]; then
+    if test ! -e "$GSDLHOME/llssite.cfg" && test -e "$GSDLHOME/llssite.cfg.in" ; then
+        cp "$GSDLHOME/llssite.cfg.in" "$GSDLHOME/llssite.cfg" ;
+    fi
+    configfile="$GSDLHOME/llssite.cfg";
+    fi ;
+
+    if test -e "$configfile" ; then
+    hostIP=`egrep "^hostIP" $configfile | awk -F= '{print $2}'` ;
+    if [ "$hostIP" != "127.0.0.1" ] ; then
+        hostIP="127.0.0.1 $hostIP"
+    fi
+    else
+    hostIP="127.0.0.1"
+    fi
+
     echo "Enter port number to use:"
     read port ;
+    echo "Enter allowed hosts to use ($hostIP localhost <hostname>) separated by spaces:"
+    read hosts ;
     echo "Allow external connections [yes/no]:"
-    read connection ;
+    read connection ;    
     if [ $connection = "yes" ] || [ $connection = "y" ] ; then
-        allowfrom="all"
-    else 
-    echo "Enter host (hostname, IP, localhost, 127.0.0.1) to use:"
-    read host ;
-    allowfrom=$host
-    if [ $allowfrom == "localhost" ]; then
-        allowfrom="127.0.0.1" ;
-    fi
+        allowfromall="Allow"
+    else
+    allowfromall="Deny"
     fi
 
@@ -73 +88 @@
     cat "$GSDLHOME/apache-httpd/$GSDLOS/conf/httpd.conf.in" \
     | sed "s@\*\*PORT\*\*@$port@g" \
-    | sed "s@\*\*CONNECTION\*\*@$allowfrom@g" \
+    | sed "s@\*\*CONNECTPERMISSION\*\*@$allowfromall@g" \
+    | sed "s@\*\*HOSTS\*\*@$hosts@g" \
     | sed "s@\*\*GSDLHOME\*\*@$GSDLHOME@g" \
     | sed "s@\*\*APACHE_HOME_OS\*\*@$GSDLHOME/apache-httpd/$GSDLOS@g" \
@@ -99 +115 @@
     echo "Configuring the apache webserver..." ;
     port=`egrep "^portnumber" $configfile | awk -F= '{print $2}'` ;
+    hosts=`egrep "^hosts" $configfile | awk -F= '{print $2}'` ;
     
     externalaccess=`egrep "^externalaccess" $configfile | awk -F= '{print $2}'` ;
@@ -105 +122 @@
     else
     externalaccess="no"
-    host=`egrep "^host" $configfile | awk -F= '{print $2}'` ;
-    fi
-
-    echo -e "$port\n$externalaccess\n$host" | _configure-port-and-connection ;
+    fi
+
+    echo -e "$port\n$hosts\n$externalaccess" | configure-port-and-connection ;
     if test -e "$GSDLHOME/apache-httpd/$GSDLOS/conf/httpd.conf" ; then
     echo $MONITOR_SUCCESS;
@@ -227 +243 @@
     configure-cgi)
     configure-cgi;;
+    set-port)
+    configure-port-and-connection;;
     test-gsdlhome)
     test-gsdlhome;;

gsdl/trunk/lib/java/server.properties

@@ -3 +3 @@
 Server2Settings.URL=Library URL prefix:
 Server2Settings.ExternalAccess=Allow external connections
+Server2Settings.AddressResolutionMethod=Address resolution method
 Server2Settings.ResolveIP=Get local IP and resolve to a name
 Server2Settings.LocalIP=Get local IP

gsdl/trunk/llssite.cfg.in

@@ -9 +9 @@
 start_browser=1
 address_resolution_method=2
-host=localhost
+hosts=127.0.0.1 localhost
+hostIP=127.0.0.1