Changeset 19023

Timestamp:

2009-04-16T19:11:30+12:00 (15 years ago)

Author:

ak19

Message:

1. gsicontrol.sh target configure-apache generates the llssite.cfg file from the llssite.cfg.in template file if one didn't already exist. 2. Before launching server.jar, GS2-server.sh creates the llssite.cfg file from the template llssite.cfg.in file if it did not exist yet. This needs to be done before server.jar is called because that will exit if the file does not exist on startup.

Location:

gsdl/trunk

Files:

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

gsdl/trunk/gs2-server.sh

@@ -58 +58 @@
 fi
 
+# If there's no llssite.cfg file, copy from the template
+if [ ! -e "$GSDLHOME/llssite.cfg" ]; then
+    if [ -e "$GSDLHOME/llssite.cfg.in" ]; then
+    cp "$GSDLHOME/llssite.cfg.in" "$GSDLHOME/llssite.cfg"
+    else
+    echo "Warning: could not find llssite.cfg.in to create llssite.cfg from."
+    fi
+fi
+    
 
 # JRE_HOME or JAVA_HOME must be set correctly to run this program

gsdl/trunk/gsicontrol.sh

@@ -70 +70 @@
     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 ;