From aa8e6906b16b3bc450962f639de3cd5c1e810518 Mon Sep 17 00:00:00 2001 From: "Endi S. Dewata" Date: Fri, 3 Nov 2023 16:49:05 -0500 Subject: [PATCH] Remove redundant securitydomain.httpsagentport --- base/server/python/pki/server/deployment/__init__.py | 1 - base/server/python/pki/server/subsystem.py | 1 - base/server/upgrade/11.5.0/01-RemoveUnusedParams.py | 3 +++ 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/base/server/python/pki/server/deployment/__init__.py b/base/server/python/pki/server/deployment/__init__.py index 9b76d6be7f2..d02fce4eda3 100644 --- a/base/server/python/pki/server/deployment/__init__.py +++ b/base/server/python/pki/server/deployment/__init__.py @@ -2573,7 +2573,6 @@ def setup_security_domain_manager(self, subsystem): subsystem.config['securitydomain.host'] = self.mdict['pki_hostname'] subsystem.config['securitydomain.httpport'] = unsecurePort subsystem.config['securitydomain.httpsadminport'] = securePort - subsystem.config['securitydomain.httpsagentport'] = securePort def pki_connect(self): diff --git a/base/server/python/pki/server/subsystem.py b/base/server/python/pki/server/subsystem.py index 1f40f9cda7b..0df12279486 100644 --- a/base/server/python/pki/server/subsystem.py +++ b/base/server/python/pki/server/subsystem.py @@ -1448,7 +1448,6 @@ def configure_security_domain( self.config['securitydomain.host'] = hostname self.config['securitydomain.httpport'] = port self.config['securitydomain.httpsadminport'] = secure_port - self.config['securitydomain.httpsagentport'] = secure_port def create_security_domain(self, name=None, as_current_user=False): diff --git a/base/server/upgrade/11.5.0/01-RemoveUnusedParams.py b/base/server/upgrade/11.5.0/01-RemoveUnusedParams.py index 24367059baf..30fbaa6fa2d 100644 --- a/base/server/upgrade/11.5.0/01-RemoveUnusedParams.py +++ b/base/server/upgrade/11.5.0/01-RemoveUnusedParams.py @@ -34,4 +34,7 @@ def upgrade_subsystem(self, instance, subsystem): logger.info('Removing securitydomain.httpseeport') subsystem.config.pop('securitydomain.httpseeport', None) + logger.info('Removing securitydomain.httpsagentport') + subsystem.config.pop('securitydomain.httpsagentport', None) + subsystem.save()