Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Bugfixes for installation and nimbusctl scripts.

  • Loading branch information...
commit c12240596c89d71ec2668fc6768a2a58bf525ff2 1 parent 770647b
@labisso labisso authored
View
1  .gitignore
@@ -14,3 +14,4 @@ web/src/python/nimbusweb/portal/generated_settings.py
web/var/
control/var/workspace-control/logs/wclog*
derby.log
+bin/tmp/
View
53 bin/create-nimbus-home.sh
@@ -2,11 +2,24 @@
CONTAINER_URL="http://www-unix.globus.org/ftppub/gt4/4.0/4.0.8/ws-core/bin/ws-core-4.0.8-bin.tar.gz"
CONTAINER_TARNAME="ws-core-4.0.8-bin.tar.gz"
+CONTAINER_UNTARREDNAME="ws-core-4.0.8"
+
+# destination directory inside $NIMBUS_HOME
CONTAINER_DIRNAME="services"
NIMBUS_SRC_REL="`dirname $0`/.."
NIMBUS_SRC=`cd $NIMBUS_SRC_REL; pwd`
+TMPDIR="$NIMBUS_SRC/bin/tmp"
+
+if [ ! -d $TMPDIR ]; then
+ mkdir $TMPDIR
+ if [ $? -ne 0 ]; then
+ echo "Failed to create temp directory: $TMPDIR"
+ exit 1
+ fi
+fi
+
if [ "X$1" == "X" ]; then
echo "\nUsage: $0 destination_dir"
echo "\tYou must specify the destination directory.\n"
@@ -33,12 +46,14 @@ if [ ! -d $NIMBUS_HOME ]; then
fi
fi
+echo "Deploying skeleton directory structure.."
cp -fr $NIMBUS_SRC/home/* $NIMBUS_HOME/
if [ $? -ne 0 ]; then
echo "Failed to copy Nimbus home directory"
exit 1
fi
+echo "Deploying web application.."
cp -r $NIMBUS_SRC/web $NIMBUS_HOME/
if [ $? -ne 0 ]; then
echo "Failed to copy Nimbus web directory"
@@ -47,25 +62,43 @@ fi
CONTAINER_DIR="$NIMBUS_HOME/$CONTAINER_DIRNAME"
if [ ! -d $CONTAINER_DIR ]; then
- mkdir $CONTAINER_DIR
+
+ echo "Downloading and installing service container.."
+
+ # fetch GT container if it doesn't already exist
+ if [ ! -f $TMPDIR/$CONTAINER_TARNAME ]; then
+ wget -c -O $TMPDIR/$CONTAINER_TARNAME $CONTAINER_URL
+
+ if [ $? -ne 0 ]; then
+ echo "Failed to download container tarball"
+ exit 1
+ fi
+ fi
+
+ tar xzf $TMPDIR/$CONTAINER_TARNAME -C $TMPDIR
if [ $? -ne 0 ]; then
- echo "Failure, could not create directory: $CONTAINER_DIR"
+ echo "Failed to expand Nimbus tarball"
exit 1
fi
-fi
-
-# fetch GT container if it doesn't already exist
-if [ ! -f $NIMBUS_HOME/$CONTAINER_TARNAME ]; then
- wget -c -O $NIMBUS_HOME/$CONTAINER_TARNAME $CONTAINER_URL
+ mv $TMPDIR/$CONTAINER_UNTARREDNAME $CONTAINER_DIR
if [ $? -ne 0 ]; then
- echo "Failed to download container tarball"
+ echo "Failed to move container directory to $CONTAINER_DIR"
exit 1
fi
+else
+ echo "Service container already exists at $CONTAINER_DIR"
fi
-tar xzf $NIMBUS_HOME/$CONTAINER_TARNAME -C $CONTAINER_DIR
+echo "Building and installing Nimbus to service container.."
+
+GLOBUS_LOCATION=$CONTAINER_DIR
+export GLOBUS_LOCATION
+
+#$NIMBUS_SRC/scripts/all-build-and-install.sh
if [ $? -ne 0 ]; then
- echo "Failed to expand Nimbus tarbal"
+ echo "Build and install FAILED!"
exit 1
fi
+
+echo "OK, successfully deployed to $NIMBUS_HOME!"
View
8 home/sbin/run-services.sh
@@ -3,6 +3,12 @@
NIMBUS_HOME_REL="`dirname $0`/.."
NIMBUS_HOME=`cd $NIMBUS_HOME_REL; pwd`
+GLOBUS_LOCATION="$NIMBUS_HOME/services"
+export GLOBUS_LOCATION
+
+X509_CERT_DIR="$NIMBUS_HOME/var/ca/trusted-certs"
+export X509_CERT_DIR
+
LOGFILE="$NIMBUS_HOME/var/services.log"
-$NIMBUS_HOME/services/bin/globus-start-container.sh > $LOGFILE 2>&1
+exec $NIMBUS_HOME/services/bin/globus-start-container > $LOGFILE 2>&1
View
2  home/sbin/run-web.sh
@@ -5,4 +5,4 @@ NIMBUS_HOME=`cd $NIMBUS_HOME_REL; pwd`
LOGFILE="$NIMBUS_HOME/var/web.log"
-$NIMBUS_HOME/web/bin/run-standalone-ssl.sh > $LOGFILE 2>&1
+exec $NIMBUS_HOME/web/bin/run-standalone-ssl.sh > $LOGFILE 2>&1
View
2  scripts/all-build-and-install.sh
@@ -5,7 +5,7 @@ NIMBUS_ANT_CMD="deploy-default-GT4.0-service -Dbuild.also=x $*"
BASEDIR_REL="`dirname $0`/.."
BASEDIR=`cd $BASEDIR_REL; pwd`
-RUN=$BASEDIR/bin/lib/gt4.0/build/run.sh
+RUN=$BASEDIR/scripts/lib/gt4.0/build/run.sh
export NIMBUS_PRINTNAME NIMBUS_ANT_CMD
exec sh $RUN
Please sign in to comment.
Something went wrong with that request. Please try again.