From 6f9d417ff906360ee2f39a432cd3faccc3f52a2e Mon Sep 17 00:00:00 2001 From: Matthew Harmsen Date: Tue, 26 Apr 2016 16:43:15 -0600 Subject: Removed pkidaemon support of apache instances - PKI TRAC Ticket #2248 - support only tomcat instances --- base/server/share/lib/systemd/system/pki-tomcatd-nuxwdog@.service | 2 +- base/server/share/lib/systemd/system/pki-tomcatd@.service | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'base/server/share/lib/systemd') 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 -- cgit