diff options
Diffstat (limited to 'www-servers/tomcat/files/6/tomcat.init')
| -rwxr-xr-x | www-servers/tomcat/files/6/tomcat.init | 26 |
1 files changed, 14 insertions, 12 deletions
diff --git a/www-servers/tomcat/files/6/tomcat.init b/www-servers/tomcat/files/6/tomcat.init index 5d08a9e23ce3..6b32e6b32e31 100755 --- a/www-servers/tomcat/files/6/tomcat.init +++ b/www-servers/tomcat/files/6/tomcat.init @@ -1,7 +1,7 @@ #!/sbin/runscript # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/files/6/tomcat.init,v 1.2 2007/01/10 19:44:57 wltjr Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/files/6/tomcat.init,v 1.3 2007/01/10 21:06:33 wltjr Exp $ init_env_vars() { # Set some sane defaults @@ -32,7 +32,12 @@ init_env_vars() { -Djava.io.tmpdir=${CATALINA_TMPDIR} \ org.apache.catalina.startup.Bootstrap " - STD_OUT=" >> ${CATALINA_BASE}/logs/catalina.out 2>&1 &" + if [ ! -f "${CATALINA_BASE}logs/catalina.out" ]; then + touch "${CATALINA_BASE}logs/catalina.out" + chown tomcat:tomcat "${CATALINA_BASE}logs/catalina.out" + fi + + STD_OUT=" 2<&1 >> ${CATALINA_BASE}logs/catalina.out" } start-helper() { @@ -40,7 +45,7 @@ start-helper() { shift local arguments="--start --quiet --background --chuid ${CATALINA_USER}:${CATALINA_GROUP} \ --make-pidfile --pidfile /var/run/tomcat.pid" - start-stop-daemon ${arguments} --exec ${executor} -- ${OPTS_CP} "$@" ${CATALINA_ARGS} ${TOMCAT_START} + start-stop-daemon ${arguments} --exec ${executor} -- ${OPTS_CP} "$@" ${CATALINA_ARGS} ${STD_OUT} ${TOMCAT_START} return $? } @@ -54,26 +59,23 @@ start() { # Figure out what arguments to pass start-helper based on TOMCAT_START if [[ "${TOMCAT_START}" == "debug" ]] ; then start-helper ${JAVA_HOME}/bin/jdb \ - -sourcepath ${CATALINA_HOME}/../../jakarta-tomcat-catalina/catalina/src/share \ - ${STD_OUT} + -sourcepath ${CATALINA_HOME}/../../jakarta-tomcat-catalina/catalina/src/share elif [[ "${TOMCAT_START}" == "debug -security" ]] ; then start-helper ${JAVA_HOME}/bin/jdb \ -sourcepath ${CATALINA_HOME}/../../jakarta-tomcat-catalina/catalina/src/share \ -Djava.security.manager \ - -Djava.security.policy=${CATALINA_BASE}/conf/catalina.policy \ - ${STD_OUT} + -Djava.security.policy=${CATALINA_BASE}/conf/catalina.policy elif [[ "${TOMCAT_START}" == "jpda start" ]] ; then - start-helper ${JAVA_HOME}/bin/java ${JPDA_OPTS} ${STD_OUT} + start-helper ${JAVA_HOME}/bin/java ${JPDA_OPTS} elif [[ "${TOMCAT_START}" == "start" ]] ; then - start-helper ${JAVA_HOME}/bin/java ${STD_OUT} + start-helper ${JAVA_HOME}/bin/java elif [[ "${TOMCAT_START}" == "start -security" ]] ; then start-helper ${JAVA_HOME}/bin/java \ -Djava.security.manager \ - -Djava.security.policy=${CATALINA_BASE}/conf/catalina.policy \ - ${STD_OUT} + -Djava.security.policy=${CATALINA_BASE}/conf/catalina.policy else eerror "Invalid TOMCAT_START variable value, or one is not set" - eerror "Please see /etc/conf.d/tomcat-5.5 for more information" + eerror "Please see /etc/conf.d/tomcat-6 for more information" eend 1 fi eend $? |