Please review the attached patch which addresses the following ticket:
* PKI TRAC #1677 - Pkidestroy of a TPS instance installed in a shared tomcat throws error. <https://fedorahosted.org/pki/ticket/1677> Without the patch: # pkidestroy Subsystem (CA/KRA/OCSP/TKS/TPS) [CA]: TPS Instance [pki-tomcat]: Begin uninstallation (Yes/No/Quit)? Yes Log file: /var/log/pki/pki-tps-destroy.20160601102651.log Loading deployment configuration from /var/lib/pki/pki-tomcat/tps/registry/tps/deployment.cfg. Uninstalling TPS from /var/lib/pki/pki-tomcat. pkidestroy : WARNING ....... Failed to update TPS connector on TKS pkidestroy : ERROR ....... TKS Host or Port is undefined Uninstallation complete. With the patch: # pkidestroy Subsystem (CA/KRA/OCSP/TKS/TPS) [CA]: TPS Instance [pki-tomcat]: Begin uninstallation (Yes/No/Quit)? Yes Log file: /var/log/pki/pki-tps-destroy.20160601110057.log Loading deployment configuration from /var/lib/pki/pki-tomcat/tps/registry/tps/deployment.cfg. Uninstalling TPS from /var/lib/pki/pki-tomcat. Uninstallation complete.
From c24d10ef0d3f07202b58168786bb8f4f6dfe0991 Mon Sep 17 00:00:00 2001 From: Matthew Harmsen <[email protected]> Date: Wed, 1 Jun 2016 11:05:19 -0600 Subject: [PATCH] Fix unknown TKS host and port connector error during TPS removal - PKI TRAC #1677 - Pkidestroy of a TPS instance installed in a shared tomcat throws error. --- base/server/python/pki/server/deployment/pkihelper.py | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/base/server/python/pki/server/deployment/pkihelper.py b/base/server/python/pki/server/deployment/pkihelper.py index 4fc8afd..50146af 100644 --- a/base/server/python/pki/server/deployment/pkihelper.py +++ b/base/server/python/pki/server/deployment/pkihelper.py @@ -3183,8 +3183,9 @@ class TPSConnector: self.mdict['pki_target_cs_cfg']) tpshost = cs_cfg.get('service.machineName') tpsport = cs_cfg.get('pkicreate.secure_port') - tkshostport = cs_cfg.get('conn.tks1.hostport') - if tkshostport is None: + tkshost = cs_cfg.get('tps.connector.tks1.host') + tksport = cs_cfg.get('tps.connector.tks1.port') + if tkshost is None or tksport is None: config.pki_log.warning( log.PKIHELPER_TPSCONNECTOR_UPDATE_FAILURE, extra=config.PKI_INDENTATION_LEVEL_2) @@ -3196,14 +3197,6 @@ class TPSConnector: else: return - # retrieve tks host and port - if ':' in tkshostport: - tkshost = tkshostport.split(':')[0] - tksport = tkshostport.split(':')[1] - else: - tkshost = tkshostport - tksport = '443' - # retrieve subsystem nickname subsystemnick = cs_cfg.get('tps.cert.subsystem.nickname') if subsystemnick is None: -- 2.5.5
_______________________________________________ Pki-devel mailing list [email protected] https://www.redhat.com/mailman/listinfo/pki-devel
