diff options
| author | Ade Lee <alee@redhat.com> | 2013-09-12 15:05:47 -0400 |
|---|---|---|
| committer | Ade Lee <alee@redhat.com> | 2013-09-17 20:12:43 -0400 |
| commit | 6ba09084f6b3f4360393b49153c76c9d4dcb608d (patch) | |
| tree | 6e8a23f92252fcedde3d72840c5c66bfaaa2dcd1 /base/server/share/lib/systemd/system/pki-tomcatd@.service | |
| parent | 8c437a7491b8e96451f677055ef89bed7b38af7d (diff) | |
| download | pki-6ba09084f6b3f4360393b49153c76c9d4dcb608d.tar.gz pki-6ba09084f6b3f4360393b49153c76c9d4dcb608d.tar.xz pki-6ba09084f6b3f4360393b49153c76c9d4dcb608d.zip | |
fixing for new tomcat systemd files
tomcat now uses systemd unit files. We will reuse and customize those
files accordingly. As a result, startup is simplified considerably -
and pkidaemon has been gutted accordingly.
We'll need to add migration scripts for older instances in a subsequent patch.
Diffstat (limited to 'base/server/share/lib/systemd/system/pki-tomcatd@.service')
| -rw-r--r-- | base/server/share/lib/systemd/system/pki-tomcatd@.service | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/base/server/share/lib/systemd/system/pki-tomcatd@.service b/base/server/share/lib/systemd/system/pki-tomcatd@.service index 18d92dd60..c003126b5 100644 --- a/base/server/share/lib/systemd/system/pki-tomcatd@.service +++ b/base/server/share/lib/systemd/system/pki-tomcatd@.service @@ -1,14 +1,19 @@ [Unit] Description=PKI Tomcat Server %i -After=pki-tomcatd.target +After=pki-tomcatd.target syslog.target network.target PartOf=pki-tomcatd.target [Service] -Type=forking -ExecStart=/usr/bin/pkidaemon start tomcat %i -ExecStop=/usr/bin/pkidaemon stop tomcat %i +Type=simple +EnvironmentFile=/etc/tomcat/tomcat.conf +Environment="NAME=%i" +EnvironmentFile=-/etc/sysconfig/%i +ExecStartPre=/usr/bin/pkidaemon start tomcat %i +ExecStart=/usr/libexec/tomcat/server start +ExecStop=/usr/libexec/tomcat/server stop SuccessExitStatus=143 +User=pkiuser +Group=pkiuser [Install] WantedBy=multi-user.target - |