Changes to config files to support nuxwdog

Specifically changes to CS.cfg, server.xml and tomcat.conf

5 files changed, 16 insertions, 1 deletions

diff --git a/base/server/config/pkislots.cfg b/base/server/config/pkislots.cfg
index 8ee93964e..23c1f824a 100644
--- a/base/server/config/pkislots.cfg
+++ b/base/server/config/pkislots.cfg
@@ -1,6 +1,7 @@
 [Tomcat]
 application_version=[APPLICATION_VERSION]
 INSTALL_TIME_SLOT=[INSTALL_TIME]
+NUXWDOG_JNI_PATH_SLOT=[NUXWDOG_JNI_PATH]
 PKI_ADMIN_SECURE_PORT_SLOT=[PKI_ADMIN_SECURE_PORT]
 PKI_ADMIN_SECURE_PORT_CONNECTOR_NAME_SLOT=[PKI_ADMIN_SECURE_PORT_CONNECTOR_NAME]
 PKI_ADMIN_SECURE_PORT_SERVER_COMMENT_SLOT=[PKI_ADMIN_SECURE_PORT_SERVER_COMMENT]
diff --git a/base/server/python/pki/server/deployment/pkiparser.py b/base/server/python/pki/server/deployment/pkiparser.py
index 7d82c18fc..93473feaf 100644
--- a/base/server/python/pki/server/deployment/pkiparser.py
+++ b/base/server/python/pki/server/deployment/pkiparser.py
@@ -1007,6 +1007,13 @@ class PKIConfigParser:
                     "+TLS_DHE_RSA_WITH_AES_128_CBC_SHA," + \
                     "+TLS_DHE_RSA_WITH_AES_256_CBC_SHA"
 
+                if config.pki_architecture == 64:
+                    self.mdict['NUXWDOG_JNI_PATH_SLOT'] = (
+                        '/usr/lib64/nuxwdog-jni')
+                else:
+                    self.mdict['NUXWDOG_JNI_PATH_SLOT'] = (
+                        '/usr/lib/nuxwdog-jni')
+
                 # tps parameters
                 self.mdict['TOKENDB_HOST_SLOT'] = \
                     self.mdict['pki_ds_hostname']
diff --git a/base/server/share/conf/tomcat.conf b/base/server/share/conf/tomcat.conf
index 8651b80bc..83a6cf1e6 100644
--- a/base/server/share/conf/tomcat.conf
+++ b/base/server/share/conf/tomcat.conf
@@ -33,7 +33,7 @@ CATALINA_TMPDIR=[PKI_TMPDIR]
 #   -Djava.library.path=/usr/lib
 # - parameters to run a java debugger (e. g. - 'eclipse')
 #   -Xdebug -Xrunjdwp:transport=dt_socket,address=8000,server=y,suspend=n -Djava.awt.headless=true -Xmx128M
-JAVA_OPTS="-DRESTEASY_LIB=[PKI_RESTEASY_LIB]"
+JAVA_OPTS="-DRESTEASY_LIB=[PKI_RESTEASY_LIB] -Djava.library.path=[NUXWDOG_JNI_PATH]"
 
 # What user should run tomcat
 TOMCAT_USER="[PKI_USER]"
@@ -68,3 +68,6 @@ PKI_VERSION=[APPLICATION_VERSION]
 # Debian settings
 TOMCAT7_USER="[PKI_USER]"
 TOMCAT7_SECURITY="[PKI_SECURITY_MANAGER]"
+
+# Use Nuxwdog to start server
+USE_NUXWDOG="false"
diff --git a/base/server/tomcat7/conf/server.xml b/base/server/tomcat7/conf/server.xml
index b9e8860b2..8b6e40473 100644
--- a/base/server/tomcat7/conf/server.xml
+++ b/base/server/tomcat7/conf/server.xml
@@ -94,6 +94,8 @@ 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.
diff --git a/base/server/tomcat8/conf/server.xml b/base/server/tomcat8/conf/server.xml
index ce8fc57dc..2f4d470be 100644
--- a/base/server/tomcat8/conf/server.xml
+++ b/base/server/tomcat8/conf/server.xml
@@ -95,6 +95,8 @@ 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.