diff options
Diffstat (limited to 'www-servers/tomcat/files/6')
| -rw-r--r-- | www-servers/tomcat/files/6/tomcat.conf | 4 | ||||
| -rwxr-xr-x | www-servers/tomcat/files/6/tomcat.init | 9 |
2 files changed, 11 insertions, 2 deletions
diff --git a/www-servers/tomcat/files/6/tomcat.conf b/www-servers/tomcat/files/6/tomcat.conf index 0e270c6345d7..5fc22e3a921e 100644 --- a/www-servers/tomcat/files/6/tomcat.conf +++ b/www-servers/tomcat/files/6/tomcat.conf @@ -1,4 +1,4 @@ -# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/files/6/tomcat.conf,v 1.4 2007/05/31 23:01:57 wltjr Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/files/6/tomcat.conf,v 1.5 2008/12/19 20:48:47 ali_bush Exp $ # JVM Runtime # Using the default setting, it will determine your JVM from the system-vm @@ -34,6 +34,8 @@ CLASSPATH=${CATALINA_LIBDIR} # (Optional) Directory path location of temporary directory the JVM should # use (java.io.tmpdir). Defaults to $CATALINA_BASE/temp. +# Note: This directory must exist and be read/writable by tomcat. +# See #246362 as an example where /var/tmp was deleted on shutdown. CATALINA_TMPDIR="/var/tmp/tomcat-6/" # TOMCAT STARTUP/SHUTDOWN diff --git a/www-servers/tomcat/files/6/tomcat.init b/www-servers/tomcat/files/6/tomcat.init index 24fbea7901c5..34178058e203 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.8 2007/05/17 21:15:05 wltjr Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/files/6/tomcat.init,v 1.9 2008/12/19 20:48:47 ali_bush Exp $ init_env_vars() { # Populate JAVA_HOME @@ -60,6 +60,13 @@ depend() { start() { ebegin "Starting Tomcat" init_env_vars + + if [ ! -e "${CATALINA_TMPDIR}" ]; then + eerror "CATALINA_TMPDIR does not exist. Unable to start tomcat." + eerror "Please see /etc/conf.d/tomcat-6 for more information." + eend 1 + fi + # Figure out what arguments to pass start_helper based on TOMCAT_START if [ "${TOMCAT_START}" = "debug" ] ; then start_helper ${JAVA_HOME}/bin/jdb \ |