summaryrefslogtreecommitdiffstats
path: root/base/server/share/lib
diff options
context:
space:
mode:
authorMatthew Harmsen <mharmsen@pki.usersys.redhat.com>2015-04-13 14:59:29 -0600
committerMatthew Harmsen <mharmsen@pki.usersys.redhat.com>2015-04-13 14:59:29 -0600
commit18b24a990ff9b97cf58aa630af0084975fe4c130 (patch)
tree1dc97c105c772000f9bc17edfac5c84d30248f22 /base/server/share/lib
parente57a2d410d19d72e902bd1792e01f1f238f2ed63 (diff)
downloadpki-18b24a990ff9b97cf58aa630af0084975fe4c130.tar.gz
pki-18b24a990ff9b97cf58aa630af0084975fe4c130.tar.xz
pki-18b24a990ff9b97cf58aa630af0084975fe4c130.zip
pki-tomcatd fails to start on system boot
- PKI TRAC Ticket #1315 - pki-tomcatd fails to start on system boot - PKI TRAC Ticket #1340 - pkidestroy should not remove /var/lib/pki
Diffstat (limited to 'base/server/share/lib')
-rw-r--r--base/server/share/lib/systemd/system/pki-tomcatd.target5
-rw-r--r--base/server/share/lib/systemd/system/pki-tomcatd@.service4
2 files changed, 2 insertions, 7 deletions
diff --git a/base/server/share/lib/systemd/system/pki-tomcatd.target b/base/server/share/lib/systemd/system/pki-tomcatd.target
index 633beae71..035f76a6e 100644
--- a/base/server/share/lib/systemd/system/pki-tomcatd.target
+++ b/base/server/share/lib/systemd/system/pki-tomcatd.target
@@ -1,8 +1,7 @@
[Unit]
Description=PKI Tomcat Server
-After=syslog.target network.target
+Wants=dirsrv.target
+After=syslog.target network.target dirsrv.target
[Install]
WantedBy=multi-user.target
-
-
diff --git a/base/server/share/lib/systemd/system/pki-tomcatd@.service b/base/server/share/lib/systemd/system/pki-tomcatd@.service
index c003126b5..be542426e 100644
--- a/base/server/share/lib/systemd/system/pki-tomcatd@.service
+++ b/base/server/share/lib/systemd/system/pki-tomcatd@.service
@@ -1,6 +1,5 @@
[Unit]
Description=PKI Tomcat Server %i
-After=pki-tomcatd.target syslog.target network.target
PartOf=pki-tomcatd.target
[Service]
@@ -14,6 +13,3 @@ ExecStop=/usr/libexec/tomcat/server stop
SuccessExitStatus=143
User=pkiuser
Group=pkiuser
-
-[Install]
-WantedBy=multi-user.target