diff options
| author | Ade Lee <alee@redhat.com> | 2015-05-06 16:06:34 -0400 |
|---|---|---|
| committer | Ade Lee <alee@redhat.com> | 2015-05-10 16:09:24 -0400 |
| commit | 7dca020819b7573cd05bd54482fb5d1afe9bb658 (patch) | |
| tree | 871e3a9d350c081e52a26b0583bd02e8f2dd761b /base/server/share/lib | |
| parent | 2db074c39334a6ec48a6fac52722f684a14bb00a (diff) | |
| download | pki-7dca020819b7573cd05bd54482fb5d1afe9bb658.tar.gz pki-7dca020819b7573cd05bd54482fb5d1afe9bb658.tar.xz pki-7dca020819b7573cd05bd54482fb5d1afe9bb658.zip | |
Patches to get nuxwdog working with systemd
This patch adds some new unit files and targets for starting instances
with nuxwdog, as well as logic within the pki-server nuxwdog module to
switch to/from the old and new systemd unit files.
It also corrects some issues found in additional testing of the nuxwdog
change scripts.
To use nuxwdog to start the instance, a user needs to do the following:
1. Create an instance normally.
2. Run: pki-server instance-nuxwdog-enable <instance_name>
3. Start the instance using:
systemctl start pki-tomcatd-nuxwdog@<instance_name>.service
To revert the instance, simply do the following:
1. Run: pki-server instance-nuxwdog-disable <instance_name>
2. Start the instance using:
systemctl start pki-tomcatd@<instance_name>.service
Diffstat (limited to 'base/server/share/lib')
| -rw-r--r-- | base/server/share/lib/systemd/system/pki-tomcatd-nuxwdog.target | 7 | ||||
| -rw-r--r-- | base/server/share/lib/systemd/system/pki-tomcatd-nuxwdog@.service | 15 |
2 files changed, 22 insertions, 0 deletions
diff --git a/base/server/share/lib/systemd/system/pki-tomcatd-nuxwdog.target b/base/server/share/lib/systemd/system/pki-tomcatd-nuxwdog.target new file mode 100644 index 000000000..06a7dcdea --- /dev/null +++ b/base/server/share/lib/systemd/system/pki-tomcatd-nuxwdog.target @@ -0,0 +1,7 @@ +[Unit] +Description=PKI Tomcat Server Started by Nuxwdog +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-nuxwdog@.service b/base/server/share/lib/systemd/system/pki-tomcatd-nuxwdog@.service new file mode 100644 index 000000000..3a0ca6538 --- /dev/null +++ b/base/server/share/lib/systemd/system/pki-tomcatd-nuxwdog@.service @@ -0,0 +1,15 @@ +[Unit] +Description=PKI Tomcat Server %i Started by Nuxwdog +PartOf=pki-tomcatd-nuxwdog.target + +[Service] +Type=forking +EnvironmentFile=/etc/tomcat/tomcat.conf +Environment="NAME=%i" +Environment="STARTED_BY_SYSTEMD=1" +EnvironmentFile=-/etc/sysconfig/%i +ExecStartPre=/usr/bin/pkidaemon start tomcat %i +ExecStart=/bin/nuxwdog -f /etc/pki/%i/nuxwdog.conf +SuccessExitStatus=143 +TimeoutStartSec=180 +PIDFile=/var/lib/pki/%i/logs/wd-%i.pid |