From 5b004df074027d1eba33c2f9038030406830cc3c Mon Sep 17 00:00:00 2001 From: Matthew Harmsen Date: Thu, 19 Jul 2012 01:04:54 -0700 Subject: PKI Deployment Scriptlets * In 'catalina.properties', removed commented out jars for each of the subsystems in the 'common.loader' * In 'server.xml', removed the line containing a '1' * Moved all parameters from the [Mandatory] and [Optional] sections of the 'pkideployment.cfg' file to other more appropriate sections (e.g. - [Common], [CA], [KRA], etc.), and removed these sections and all of their associated logic from the 'pki-deploy' package * Resolved Dogtag TRAC Ticket #225 Dogtag 10: Move "pkispawn"/"pkidestroy" logs * Removed all security domain references from external CA logic * Added new 'pki_subsystem_name' parameter to 'pkideployment.cfg' file, and applied logic throughout 'pki-deploy' * Added new error message in the case of an unset DNS domain name, and replaced the log message with a simple print in the case of a 'domainname' exception --- base/common/shared/conf/catalina.properties | 4 - base/common/shared/conf/server.xml | 1 - base/deploy/config/pkideployment.cfg | 95 +++++++++++----------- base/deploy/src/pkidestroy | 26 ++---- base/deploy/src/pkispawn | 28 ++----- .../deploy/src/scriptlets/infrastructure_layout.py | 16 ++-- base/deploy/src/scriptlets/initialization.py | 3 +- base/deploy/src/scriptlets/pkiconfig.py | 4 +- base/deploy/src/scriptlets/pkijython.py | 23 ++---- base/deploy/src/scriptlets/pkimessages.py | 10 +-- base/deploy/src/scriptlets/pkiparser.py | 94 ++++++++++++++++++--- 11 files changed, 161 insertions(+), 143 deletions(-) diff --git a/base/common/shared/conf/catalina.properties b/base/common/shared/conf/catalina.properties index c44758699..003089a43 100644 --- a/base/common/shared/conf/catalina.properties +++ b/base/common/shared/conf/catalina.properties @@ -51,10 +51,6 @@ package.definition=sun.,java.,org.apache.catalina.,org.apache.coyote.,org.apache # repositories # "foo/bar.jar": Add bar.jar as a class repository common.loader=${catalina.base}/lib,${catalina.base}/lib/*.jar,${catalina.home}/lib,${catalina.home}/lib/*.jar,[TOMCAT_INSTANCE_COMMON_LIB] -#,[PKI_INSTANCE_PATH]/webapps/ca/WEB-INF/lib/pki-ca.jar -#,[PKI_INSTANCE_PATH]/webapps/kra/WEB-INF/lib/pki-kra.jar -#,[PKI_INSTANCE_PATH]/webapps/ocsp/WEB-INF/lib/pki-ocsp.jar -#,[PKI_INSTANCE_PATH]/webapps/tks/WEB-INF/lib/pki-tks.jar # # List of comma-separated paths defining the contents of the "server" diff --git a/base/common/shared/conf/server.xml b/base/common/shared/conf/server.xml index 46ee15b0b..375764294 100644 --- a/base/common/shared/conf/server.xml +++ b/base/common/shared/conf/server.xml @@ -126,7 +126,6 @@ Tomcat Port = [TOMCAT_SERVER_PORT] (for shutdown) [PKI_SECURE_PORT_SERVER_COMMENT]