diff options
| author | Ade Lee <alee@redhat.com> | 2014-08-06 13:55:14 -0400 |
|---|---|---|
| committer | Ade Lee <alee@redhat.com> | 2014-08-06 22:37:40 -0400 |
| commit | 7e202c1f800cbf45aefa53ae3dc90d780d123f18 (patch) | |
| tree | 2e19ca234e41c7d50b66d0b7624b732bc5db5baa /base/server | |
| parent | 855459bdd16538da63935bc38373c4e412c9e0f1 (diff) | |
| download | pki-7e202c1f800cbf45aefa53ae3dc90d780d123f18.tar.gz pki-7e202c1f800cbf45aefa53ae3dc90d780d123f18.tar.xz pki-7e202c1f800cbf45aefa53ae3dc90d780d123f18.zip | |
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
Diffstat (limited to 'base/server')
| -rw-r--r-- | base/server/python/pki/server/deployment/pkihelper.py | 8 |
1 files changed, 8 insertions, 0 deletions
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\ |