PKI Deployment Scriptlets

* TRAC Ticket #263 - Dogtag 10: Fix 'pkidestroy' problem of sporadically "not"
  removing "/etc/sysconfig/{pki_instance_id}" . . .
* TRAC Ticket #264 - Dogtag 10: Enable various other subsystems for
  configuration . . .
* TRAC Ticket #261 - Dogtag 10: Revisit command-line options of 'pkispawn' and
  'pkidestroy' . . .
* TRAC Ticket #268 - Dogtag 10: Create a parameter for optional restart of
  configured PKI instance . . .
* TRAC Ticket #270 - Dogtag 10: Add missing parameters to
  'pkideployment.cfg' . . .
* TRAC Ticket #265 - Dogtag 10: Provide configurable options for PKI client
  information . . .
* TRAC Ticket #275 - Dogtag 10: Add debug information (comments) to Tomcat 7
  "logging.properties"
* TRAC Ticket #276 - Dogtag 10: Relocate all 'pin' data to the 'sensitive'
  dictionary
* TRAC Ticket #277 - Dogtag 10: Create an 'archive' for 'manifest' and
  'pkideployment.cfg' files
* TRAC Ticket #278 - Dogtag 10: Fix Miscellaneous PKI Deployment Scriptlet
  Issues . . .

1 files changed, 0 insertions, 18 deletions

diff --git a/base/deploy/src/pkidestroy b/base/deploy/src/pkidestroy
index 1e0f02031..165ccb06c 100755
--- a/base/deploy/src/pkidestroy
+++ b/base/deploy/src/pkidestroy
@@ -30,9 +30,7 @@ try:
     import logging
     import os
     import pprint
-    import random
     import socket
-    import string
     import struct
     import subprocess
     import time
@@ -139,22 +137,6 @@ def main(argv):
         config.pki_log.debug(pp.pformat(config.pki_subsystem_dict),
                              extra=config.PKI_INDENTATION_LEVEL_0)
 
-    # Override PKI configuration file values with 'custom' command-line values.
-    if not config.custom_pki_admin_domain_name is None:
-        config.pki_common_dict['pki_admin_domain_name'] =\
-            config.custom_pki_admin_domain_name
-    if not config.custom_pki_instance_name is None:
-        config.pki_web_server_dict['pki_instance_name'] =\
-            config.custom_pki_instance_name
-    if not config.custom_pki_http_port is None:
-        config.pki_web_server_dict['pki_http_port'] =\
-            config.custom_pki_http_port
-    if not config.custom_pki_https_port is None:
-        config.pki_web_server_dict['pki_https_port'] =\
-            config.custom_pki_https_port
-    if not config.custom_pki_ajp_port is None:
-        config.pki_web_server_dict['pki_ajp_port'] =\
-            config.custom_pki_ajp_port
     # NEVER print out 'sensitive' name/value pairs!!!
     config.pki_log.debug(log.PKI_DICTIONARY_COMMON,
                          extra=config.PKI_INDENTATION_LEVEL_0)