Blob Blame History Raw
diff -up ./Server/src/bin/start-openas2.sh.fedora ./Server/src/bin/start-openas2.sh
--- ./Server/src/bin/start-openas2.sh.fedora	2019-09-29 12:29:26.000000000 -0400
+++ ./Server/src/bin/start-openas2.sh	2019-10-22 20:55:34.521618368 -0400
@@ -3,7 +3,9 @@ set -e
 # purpose: runs the OpenAS2 application     
 x=`basename $0`
 
-binDir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+if [ -z "$OPENAS2_BASE" ]; then
+  OPENAS2_BASE="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"/..
+fi
 keyStorePwd=$1
 PWD_OVERRIDE=""
 
@@ -14,7 +16,7 @@ if [ -n "$PID_FILE" ] && [ -z "$OPENAS2_
 fi
 
 if [ -z "$OPENAS2_PID" ]; then
-  export OPENAS2_PID=$binDir/OpenAS2.pid
+  export OPENAS2_PID=$OPENAS2_BASE/OpenAS2.pid
 fi
 
 # Set some of the base system properties for the Java environment and logging
@@ -26,7 +28,12 @@ EXTRA_PARMS="-Xms32m -Xmx384m -Dorg.apac
 if [ -z $OPENAS2_CONFIG_FILE ]; then
   OPENAS2_CONFIG_FILE=${binDir}/../config/config.xml
 fi
-EXTRA_PARMS="$EXTRA_PARMS -Dopenas2.config.file=${OPENAS2_CONFIG_FILE}"
+EXTRA_PARMS="$EXTRA_PARMS -Dopenas2.config.file=${OPENAS2_BASE}/config/config.xml"
+
+# Initialize the database if not present
+if test -z "$(ls -A ${OPENAS2_BASE}/db)"; then
+  cp -rp ${OPENAS2_BASE}/config/DB/* ${OPENAS2_BASE}/db
+fi
 
 # For versions of Java that prevent restricted HTTP headers (see documentation for discussion on this)
 #EXTRA_PARMS="$EXTRA_PARMS -Dsun.net.http.allowRestrictedHeaders=true"
@@ -65,7 +72,7 @@ if [ -z $JAVA_HOME ]; then
   exit 1
 fi
 
-CMD=`echo "${JAVA_HOME}/bin/java ${PWD_OVERRIDE} ${EXTRA_PARMS} -cp .:${binDir}/../lib/* org.openas2.app.OpenAS2Server"`
+CMD=`echo "${JAVA_HOME}/bin/java ${PWD_OVERRIDE} ${EXTRA_PARMS} -cp .:${OPENAS2_BASE}/lib/* org.openas2.app.OpenAS2Server"`
 echo
 echo Running ${CMD}
 echo
@@ -81,4 +88,4 @@ else
   ${CMD}
   RETVAL="$?"
 fi
-exit $RETVAL
\ No newline at end of file
+exit $RETVAL