Changeset 20622 for gsdl/trunk/gsicontrol.sh

Timestamp:

2009-09-17T19:26:01+12:00 (15 years ago)

Author:

ak19

Message:

No more properties hosts in llssite.cfg and glisite.cfg config files. Now the host IP is always written into these and then written into httpd.conf by gsicontrol.sh.

File:

• gsdl/trunk/gsicontrol.sh (modified) (4 diffs)

gsdl/trunk/gsicontrol.sh

@@ -51 +51 @@
 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 "Enter host IP to allow (127.0.0.1 is included by default):"
+    read hostIP ;
     echo "Allow external connections [yes/no]:"
     read connection ;    
@@ -89 +72 @@
     | sed "s@\*\*PORT\*\*@$port@g" \
     | sed "s@\*\*CONNECTPERMISSION\*\*@$allowfromall@g" \
-    | sed "s@\*\*HOSTS\*\*@$hosts@g" \
+    | sed "s@\*\*HOST_IP\*\*@$hostIP@g" \
     | sed "s@\*\*GSDLHOME\*\*@$GSDLHOME@g" \
     | sed "s@\*\*APACHE_HOME_OS\*\*@$GSDLHOME/apache-httpd/$GSDLOS@g" \
@@ -115 +98 @@
     echo "Configuring the apache webserver..." ;
     port=`egrep "^portnumber" $configfile | awk -F= '{print $2}'` ;
-    hosts=`egrep "^hosts" $configfile | awk -F= '{print $2}'` ;
+    hostIP=`egrep "^hostIP" $configfile | awk -F= '{print $2}'` ;
     
     externalaccess=`egrep "^externalaccess" $configfile | awk -F= '{print $2}'` ;
@@ -124 +107 @@
     fi
 
-    echo -e "$port\n$hosts\n$externalaccess" | configure-port-and-connection ;
+    echo -e "$port\n$hostIP\n$externalaccess" | configure-port-and-connection ;
     if test -e "$GSDLHOME/apache-httpd/$GSDLOS/conf/httpd.conf" ; then
     echo $MONITOR_SUCCESS;