diff options
Diffstat (limited to 'system/apache-tomcat/rc.tomcat')
| -rw-r--r-- | system/apache-tomcat/rc.tomcat | 23 |
1 files changed, 19 insertions, 4 deletions
diff --git a/system/apache-tomcat/rc.tomcat b/system/apache-tomcat/rc.tomcat index 75c083b679..e3630784a1 100644 --- a/system/apache-tomcat/rc.tomcat +++ b/system/apache-tomcat/rc.tomcat @@ -9,10 +9,14 @@ # Load environment variables . /etc/profile.d/apache-tomcat.sh -if [ -e "/etc/profile.d/openjdk.sh" ]; then - . /etc/profile.d/openjdk.sh -else - . /etc/profile.d/jdk.sh + +if [ -z "$JAVA_HOME" ]; then + for i in /etc/profile.d/*jdk*.sh; do + if [ -x $i ]; then + source $i + break + fi + done fi PIDFILE="/var/spool/tomcat/tomcat.pid" @@ -38,6 +42,17 @@ TOMCAT_CMD="-user $USER -cp $CLASSPATH \ tomcat_start() { echo -n "Starting Apache Tomcat ... " + if ! [ -e /var/run/tomcat ]; then + mkdir /var/run/tomcat + chown tomcat:tomcat /var/run/tomcat + chmod 755 /var/run/tomcat + fi + if ! [ -e /var/tmp/tomcat ]; then + mkdir /var/tmp/tomcat + chown tomcat:tomcat /var/tmp/tomcat + chmod 755 /var/tmp/tomcat + fi + if [ -e "$PIDFILE" ]; then echo "already running!" else |