Changeset 18866

Timestamp:

2009-04-01T19:08:28+13:00 (15 years ago)

Author:

ak19

Message:

The configure-web and configure-apache targets now take an extra optional parameter, the configuration file, which defaults to llssite.cfg if none is provided.

File:

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

gsdl/trunk/gsicontrol.sh

@@ -69 +69 @@
 function configure-apache {
     test-gsdlhome
+    configfile=$1 ;
+    if [ "x$configfile" = "x" ]; then
+    configfile="$GSDLHOME/llssite.cfg";
+    fi ;
     echo "Configuring the apache webserver..." ;
-    port=`egrep "^apache.port" $GSDLHOME/lib/java/build.properties | awk -F= '{print $2}'` ;
+    port=`egrep "^portnumber" $configfile | awk -F= '{print $2}'` ;
     echo $port | configure-port ;
     if test -e "$GSDLHOME/apache-httpd/$GSDLOS/conf/httpd.conf" ; then
@@ -82 +86 @@
 function configure-web {
     configure-cgi
-    configure-apache
+    configure-apache $1
 }
 
@@ -129 +133 @@
 
 
-if [ $# != 1 ] ; then
+if [[ $# < 1  || $# > 2 ]] ; then
     echo ""
     echo "   Usage: $0 <command>"
@@ -139 +143 @@
     echo "   web-graceful"
     echo "   configure-admin"
-    echo "   configure-web"
+    echo "   configure-web [config-filename]"
+    echo "   configure-apache [config-filename]"
     echo "   configure-port"
-    echo "   configure-apache"
     echo "   configure-cgi"
     echo "   test-gsdlhome"
@@ -150 +154 @@
 
 target=$1
+configfile=$2
 
 case $target in
@@ -165 +170 @@
     configure-admin;;
     configure-web)
-    configure-web;;
+    configure-web $configfile;;
     configure-port)
     configure-port;;
     configure-apache)
-    configure-apache;;
+    configure-apache $configfile;;
     configure-cgi)
     configure-cgi;;