summaryrefslogtreecommitdiffstats
path: root/base/server/share/lib/systemd/system
diff options
context:
space:
mode:
authorMatthew Harmsen <mharmsen@pki.usersys.redhat.com>2016-04-26 16:43:15 -0600
committerMatthew Harmsen <mharmsen@pki.usersys.redhat.com>2016-04-27 12:38:20 -0600
commit6f9d417ff906360ee2f39a432cd3faccc3f52a2e (patch)
treed9a4f3391073acc358cc9f2fbfe23a0fe26e40d5 /base/server/share/lib/systemd/system
parent849705a4cde92e61d3edaa5c266f97661d65f797 (diff)
downloadpki-6f9d417ff906360ee2f39a432cd3faccc3f52a2e.tar.gz
pki-6f9d417ff906360ee2f39a432cd3faccc3f52a2e.tar.xz
pki-6f9d417ff906360ee2f39a432cd3faccc3f52a2e.zip
Removed pkidaemon support of apache instances
- PKI TRAC Ticket #2248 - support only tomcat instances
Diffstat (limited to 'base/server/share/lib/systemd/system')
-rw-r--r--base/server/share/lib/systemd/system/pki-tomcatd-nuxwdog@.service2
-rw-r--r--base/server/share/lib/systemd/system/pki-tomcatd@.service2
2 files changed, 2 insertions, 2 deletions
diff --git a/base/server/share/lib/systemd/system/pki-tomcatd-nuxwdog@.service b/base/server/share/lib/systemd/system/pki-tomcatd-nuxwdog@.service
index 3a0ca6538..228ba9754 100644
--- a/base/server/share/lib/systemd/system/pki-tomcatd-nuxwdog@.service
+++ b/base/server/share/lib/systemd/system/pki-tomcatd-nuxwdog@.service
@@ -8,7 +8,7 @@ EnvironmentFile=/etc/tomcat/tomcat.conf
Environment="NAME=%i"
Environment="STARTED_BY_SYSTEMD=1"
EnvironmentFile=-/etc/sysconfig/%i
-ExecStartPre=/usr/bin/pkidaemon start tomcat %i
+ExecStartPre=/usr/bin/pkidaemon start %i
ExecStart=/bin/nuxwdog -f /etc/pki/%i/nuxwdog.conf
SuccessExitStatus=143
TimeoutStartSec=180
diff --git a/base/server/share/lib/systemd/system/pki-tomcatd@.service b/base/server/share/lib/systemd/system/pki-tomcatd@.service
index be542426e..59858c6c9 100644
--- a/base/server/share/lib/systemd/system/pki-tomcatd@.service
+++ b/base/server/share/lib/systemd/system/pki-tomcatd@.service
@@ -7,7 +7,7 @@ Type=simple
EnvironmentFile=/etc/tomcat/tomcat.conf
Environment="NAME=%i"
EnvironmentFile=-/etc/sysconfig/%i
-ExecStartPre=/usr/bin/pkidaemon start tomcat %i
+ExecStartPre=/usr/bin/pkidaemon start %i
ExecStart=/usr/libexec/tomcat/server start
ExecStop=/usr/libexec/tomcat/server stop
SuccessExitStatus=143