Start of changes to allow service to run with tomcat6 and Sun Java6.
This commit is contained in:
@@ -20,15 +20,21 @@ CATALINA_BASE="/srv/www/casaats"
|
||||
|
||||
if [ -d /usr/share/tomcat6 ]; then
|
||||
CATALINA_HOME="/usr/share/tomcat6"
|
||||
CATALINA_START_CMD="/usr/bin/dtomcat6 start"
|
||||
CATALINA_STOP_CMD="/usr/bin/dtomcat6 stop"
|
||||
TOMCAT_CFG="/etc/CASA/authtoken/svc/tomcat6.conf"
|
||||
else
|
||||
if [ -d /usr/share/tomcat55 ]; then
|
||||
CATALINA_HOME="/usr/share/tomcat55"
|
||||
else
|
||||
CATALINA_HOME="/usr/share/tomcat5"
|
||||
fi
|
||||
CATALINA_START_CMD="$CATALINA_HOME/bin/startup.sh"
|
||||
CATALINA_STOP_CMD="$CATALINA_HOME/bin/shutdown.sh"
|
||||
TOMCAT_CFG=
|
||||
fi
|
||||
|
||||
CATALINA_PID="/var/lib/CASA/authtoken/svc/casaatsd.pid"
|
||||
JAVA_OPTS="-Dcom.novell.casa.authtoksvc.config=/etc/CASA/authtoken/svc -Dlog4j.configuration=file:/etc/CASA/authtoken/svc/log4j.properties -Djava.library.path=/usr/$LIB"
|
||||
export CATALINA_BASE CATALINA_HOME CATALINA_PID JAVA_HOME JAVA_OPTS
|
||||
export JAVA_HOME CATALINA_BASE CATALINA_HOME CATALINA_START_CMD CATALINA_STOP_CMD TOMCAT_CFG CATALINA_PID JAVA_OPTS
|
||||
|
||||
|
||||
Reference in New Issue
Block a user