summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul P. Komkoff <i@stingr.net>2013-06-11 21:56:51 +0400
committerPaul P. Komkoff <i@stingr.net>2013-06-11 21:56:51 +0400
commit935d478a7b7aca12019be19eedbefb065eb79e10 (patch)
tree0fe42cd609501422d902965c6cbbc9d4f996d522
parent0543334466f586650a6e86a34b779bf33d67f72f (diff)
downloadtomcat-master.tar.gz
tomcat-master.tar.xz
tomcat-master.zip
-rw-r--r--tomcat-7.0.service16
-rw-r--r--tomcat-named.service8
2 files changed, 16 insertions, 8 deletions
diff --git a/tomcat-7.0.service b/tomcat-7.0.service
index e2ab30c..103d464 100644
--- a/tomcat-7.0.service
+++ b/tomcat-7.0.service
@@ -1,19 +1,19 @@
-# Systemd unit file for tomcat
+# Systemd unit file for default tomcat
#
# To create clones of this service:
-# 1) By default SERVICE_NAME=tomcat. When cloned, the value must be defined
-# before tomcat-sysd is called.
-# 2) Create /etc/sysconfig/${SERVICE_NAME} from /etc/sysconfig/tomcat
-# to override tomcat defaults
+# DO NOTHING, use tomcat@.service instead.
[Unit]
Description=Apache Tomcat Web Application Container
After=syslog.target network.target
[Service]
-Type=forking
-ExecStart=/usr/sbin/tomcat-sysd start
-ExecStop=/usr/sbin/tomcat-sysd stop
+Type=simple
+EnvironmentFile=/etc/tomcat/tomcat.conf
+Environment="NAME="
+EnvironmentFile=-/etc/sysconfig/tomcat
+ExecStart=/usr/libexec/tomcat/server start
+ExecStop=/usr/libexec/tomcat/server stop
SuccessExitStatus=143
User=tomcat
Group=tomcat
diff --git a/tomcat-named.service b/tomcat-named.service
index 95f454f..9bbcb17 100644
--- a/tomcat-named.service
+++ b/tomcat-named.service
@@ -1,3 +1,11 @@
+# Systemd unit file for tomcat instances.
+#
+# To create clones of this service:
+# 0. systemctl enable tomcat@name.service
+# 1. create catalina.base directory structure in
+# /var/lib/tomcats/name
+# 2. profit.
+
[Unit]
Description=Apache Tomcat Web Application Container
After=syslog.target network.target