summaryrefslogtreecommitdiffstats
path: root/base/server/tomcat7
diff options
context:
space:
mode:
authorAde Lee <alee@redhat.com>2015-05-06 16:06:34 -0400
committerAde Lee <alee@redhat.com>2015-05-10 16:09:24 -0400
commit7dca020819b7573cd05bd54482fb5d1afe9bb658 (patch)
tree871e3a9d350c081e52a26b0583bd02e8f2dd761b /base/server/tomcat7
parent2db074c39334a6ec48a6fac52722f684a14bb00a (diff)
downloadpki-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/tomcat7')
-rw-r--r--base/server/tomcat7/conf/server.xml4
1 files changed, 2 insertions, 2 deletions
diff --git a/base/server/tomcat7/conf/server.xml b/base/server/tomcat7/conf/server.xml
index 8b6e40473..e6c4bd201 100644
--- a/base/server/tomcat7/conf/server.xml
+++ b/base/server/tomcat7/conf/server.xml
@@ -79,6 +79,8 @@ Tomcat Port = [TOMCAT_SERVER_PORT] (for shutdown)
<!-- has been EXCLUDED from the Tomcat 7 'tomcat-lib' RPM! -->
<!-- Listener className="org.apache.catalina.mbeans.ServerLifecycleListener" -->
<Listener className="org.apache.catalina.mbeans.GlobalResourcesLifecycleListener" />
+
+ <Listener className="com.netscape.cms.tomcat.PKIListener"/>
<!-- Global JNDI resources
Documentation at /docs/jndi-resources-howto.html
@@ -94,8 +96,6 @@ Tomcat Port = [TOMCAT_SERVER_PORT] (for shutdown)
pathname="conf/tomcat-users.xml" />
</GlobalNamingResources>
- <Listener className="com.netscape.cms.tomcat.NuxwdogPasswordStoreInitializer"/>
-
<!-- A "Service" is a collection of one or more "Connectors" that share
a single "Container" Note: A "Service" is not itself a "Container",
so you may not define subcomponents such as "Valves" at this level.