Enable multiple instances on same installation.

This keeps the default tomcat.service unchanged (except for internals),
and adds template for tomcat@name.service services.

In the new world, if you need an instance, you'll create a directory
/var/lib/tomcats/name, create {conf temp work webapps} in it, and then
systemctl enable tomcat@name.service.

This commit doesn't contain anything related to jsvc.

1 files changed, 22 insertions, 24 deletions

diff --git a/tomcat-7.0.conf b/tomcat-7.0.conf
index a500479..03119b7 100644
--- a/tomcat-7.0.conf
+++ b/tomcat-7.0.conf
@@ -1,30 +1,37 @@
 # System-wide configuration file for tomcat services
-# This will be sourced by tomcat and any secondary service
-# Values will be overridden by service-specific configuration
-# files in /etc/sysconfig
+# This will be loaded by systemd as an environment file,
+# so please keep the syntax.
 #
-# Use this one to change default values for all services
-# Change the service specific ones to affect only one service
-# (see, for instance, /etc/sysconfig/tomcat)
+# There are 2 "classes" of startup behavior in this package.
+# The old one, the default service named tomcat.service.
+# The new named instances are called tomcat@instance.service.
 #
+# Use this file to change default values for all services.
+# Change the service specific ones to affect only one service.
+# For tomcat.service it's /etc/sysconfig/tomcat, for
+# tomcat@instance it's /etc/sysconfig/tomcat@instance.
+
+# This variable is used to figure out if config is loaded or not.
+TOMCAT_CFG_LOADED="1"
+
+# In new-style instances, if CATALINA_BASE isn't specified, it will
+# be constructed by joining TOMCATS_BASE and NAME.
+TOMCATS_BASE="/var/lib/tomcats/"
 
 # Where your java installation lives
 JAVA_HOME="/usr/lib/jvm/jre"
 
 # Where your tomcat installation lives
-CATALINA_BASE="@@@TCHOME@@@"
 CATALINA_HOME="@@@TCHOME@@@"
-JASPER_HOME="@@@TCHOME@@@"
-CATALINA_TMPDIR="@@@TCTEMP@@@"
+
+# System-wide tmp
+CATALINA_TMPDIR="/var/cache/tomcat/temp"
 
 # You can pass some parameters to java here if you wish to
 #JAVA_OPTS="-Xminf0.1 -Xmaxf0.3"
 
 # Use JAVA_OPTS to set java.library.path for libtcnative.so
-#JAVA_OPTS="-Djava.library.path=@@@LIBDIR@@@"
-
-# What user should run tomcat
-TOMCAT_USER="tomcat"
+#JAVA_OPTS="-Djava.library.path=/usr/lib"
 
 # You can change your tomcat locale here
 #LANG="en_US"
@@ -33,18 +40,9 @@ TOMCAT_USER="tomcat"
 SECURITY_MANAGER="false"
 
 # Time to wait in seconds, before killing process
-SHUTDOWN_WAIT="30"
-
-# Whether to annoy the user with "attempting to shut down" messages or not
-SHUTDOWN_VERBOSE="false"
-
-# Set the TOMCAT_PID location
-CATALINA_PID="/var/run/tomcat.pid"
-
-# Connector port is 8080 for this tomcat instance
-#CONNECTOR_PORT="8080"
+# TODO(stingray): does nothing, fix.
+# SHUTDOWN_WAIT="30"
 
 # If you wish to further customize your tomcat environment,
 # put your own definitions here
 # (i.e. LD_LIBRARY_PATH for some jdbc drivers)
-