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, 7 insertions, 52 deletions

diff --git a/tomcat-7.0.sysconfig b/tomcat-7.0.sysconfig
index c1337e8..3117bf7 100644
--- a/tomcat-7.0.sysconfig
+++ b/tomcat-7.0.sysconfig
@@ -1,56 +1,11 @@
 # Service-specific configuration file for tomcat. This will be sourced by
-# the SysV init script after the global configuration file
-# /etc/tomcat/tomcat.conf, thus allowing values to be overridden in
-# a per-service manner.
-#
-# NEVER change the init script itself. To change values for all services make
-# your changes in /etc/tomcat/tomcat.conf
-#
-# To change values for a specific service make your edits here.
-# To create a new service create a link from /etc/init.d/<your new service> to
-# /etc/init.d/tomcat (do not copy the init script) and make a copy of the
-# /etc/sysconfig/tomcat file to /etc/sysconfig/<your new service> and change
-# the property values so the two services won't conflict. Register the new
-# service in the system as usual (see chkconfig and similars).
-#
+# systemd for the default service (tomcat.service)
+# If you want to customize named instance, make a similar file
+# and name it tomcat@instancename.
 
-# Where your java installation lives
-#JAVA_HOME="/usr/lib/jvm/java"
-
-# Where your tomcat installation lives
+# You will not need to set this, usually. For default service it equals
+# CATALINA_HOME. For named service, it equals ${TOMCATS_BASE}${NAME}
 #CATALINA_BASE="@@@TCHOME@@@"
-#CATALINA_HOME="@@@TCHOME@@@"
-#JASPER_HOME="@@@TCHOME@@@"
-#CATALINA_TMPDIR="@@@TCTEMP@@@"
-
-# 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"
-
-# You can change your tomcat locale here
-#LANG="en_US"
-
-# Run tomcat under the Java Security Manager
-#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"
-
-# If you wish to further customize your tomcat environment,
-# put your own definitions here
-# (i.e. LD_LIBRARY_PATH for some jdbc drivers)
 
+# Please take a look at /etc/tomcat/tomcat.conf to have an idea what you
+# can override.