From 7e202c1f800cbf45aefa53ae3dc90d780d123f18 Mon Sep 17 00:00:00 2001 From: Ade Lee Date: Wed, 6 Aug 2014 13:55:14 -0400 Subject: Fix pkidestroy for proxy ports Current pkidestroy fails to remove a system that has been configured to use proxy ports because the wrong ports are passed into the updateDomainXML servlet. This small patch fixes this problem. Ticket #1095 --- base/server/python/pki/server/deployment/pkihelper.py | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'base/server/python') diff --git a/base/server/python/pki/server/deployment/pkihelper.py b/base/server/python/pki/server/deployment/pkihelper.py index 584181172..0d45d158f 100644 --- a/base/server/python/pki/server/deployment/pkihelper.py +++ b/base/server/python/pki/server/deployment/pkihelper.py @@ -2942,6 +2942,14 @@ class SecurityDomain: typeval = cs_cfg.get('cs.type', '') agentsport = cs_cfg.get('pkicreate.agent_secure_port', '') + # fix ports for proxy settings + proxy_secure_port = cs_cfg.get('proxy.securePort', '') + if proxy_secure_port != '': + adminsport = proxy_secure_port + agentsport = proxy_secure_port + sport = proxy_secure_port + ncsport = proxy_secure_port + # NOTE: Don't check for the existence of 'httpport', as this will # be undefined for a Security Domain that has been migrated! if sechost is None or\ -- cgit