| 1 | Author: Holger Jaekel <[email protected]>
|
| 2 | Summary: fix paths in daemon.sh
|
| 3 | ----
|
| 4 |
|
| 5 | |
| 6 | |
| 7 | @@ -88,7 +88,7 @@
|
| 8 | test ".$MAX_FD" = . && MAX_FD="maximum"
|
| 9 | # Setup parameters for running the jsvc
|
| 10 | #
|
| 11 | -test ".$TOMCAT_USER" = . && TOMCAT_USER=tomcat
|
| 12 | +test ".$TOMCAT_USER" = . && TOMCAT_USER=tomcat9
|
| 13 | # Set JAVA_HOME to working JDK or JRE
|
| 14 | # If not set we'll try to guess the JAVA_HOME
|
| 15 | # from java binary if on the PATH
|
| 16 | @@ -111,16 +111,10 @@
|
| 17 | fi
|
| 18 |
|
| 19 | # Only set CATALINA_HOME if not already set
|
| 20 | -test ".$CATALINA_HOME" = . && CATALINA_HOME=`cd "$DIRNAME/.." >/dev/null; pwd`
|
| 21 | +test ".$CATALINA_HOME" = . && CATALINA_HOME=/usr/share/tomcat9
|
| 22 | test ".$CATALINA_BASE" = . && CATALINA_BASE="$CATALINA_HOME"
|
| 23 | test ".$CATALINA_MAIN" = . && CATALINA_MAIN=org.apache.catalina.startup.Bootstrap
|
| 24 | -# If not explicitly set, look for jsvc in CATALINA_BASE first then CATALINA_HOME
|
| 25 | -if [ -z "$JSVC" ]; then
|
| 26 | - JSVC="$CATALINA_BASE/bin/jsvc"
|
| 27 | - if [ ! -x "$JSVC" ]; then
|
| 28 | - JSVC="$CATALINA_HOME/bin/jsvc"
|
| 29 | - fi
|
| 30 | -fi
|
| 31 | +JSVC=/usr/bin/jsvc
|
| 32 | # Set the default service-start wait time if necessary
|
| 33 | test ".$SERVICE_START_WAIT_TIME" = . && SERVICE_START_WAIT_TIME=10
|
| 34 |
|