IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

Don't run kra.configure_instance if not necessary

Browse Source 
If kra should not be set up, don't run the code as it would only
prolong the installations.

Previously, krainstance configuration would be performed just to
export the client certificate and private key to authenticate to
certificate server. This is now performed somewhere else therefore
there's no need to run KRAInstance.configure_instance.

The kra.install() method still performs actions on replicas and
we're keeping it in server installer to conform to the installers
design.

https://fedorahosted.org/freeipa/ticket/5695

Reviewed-By: Jan Cholasta <jcholast@redhat.com>
This commit is contained in:
Stanislav Laznicka 2017-01-04 08:41:26 +01:00 committed by Jan Cholasta
parent 2a1494c9ae
commit 1e89d28aaf
2 changed files with 37 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ipaserver/install/kra.py
View File

@ -69,6 +69,8 @@ def install_check(api, replica_config, options):
def install(api, replica_config, options):
if replica_config is None:
if not options.setup_kra:
return
realm_name = api.env.realm
dm_password = options.dm_password
host_name = api.env.host
@ -76,9 +78,10 @@ def install(api, replica_config, options):
pkcs12_info = None
master_host = None
ra_only = not options.setup_kra
promote = False
else:
if not replica_config.setup_kra:
return
krafile = os.path.join(replica_config.dir, 'kracert.p12')
if options.promote:
custodia = custodiainstance.CustodiaInstance(
@ -103,7 +106,6 @@ def install(api, replica_config, options):
pkcs12_info = (krafile,)
master_host = replica_config.kra_host_name
ra_only = not replica_config.setup_kra
promote = options.promote
kra = krainstance.KRAInstance(realm_name)
@ -111,14 +113,11 @@ def install(api, replica_config, options):
subject_base=subject_base,
pkcs12_info=pkcs12_info,
master_host=master_host,
ra_only=ra_only,
promote=promote)
_service.print_msg("Restarting the directory server")
ds = dsinstance.DsInstance()
ds.restart()
if not ra_only:
kra.enable_client_auth_to_db(paths.KRA_CS_CFG_PATH)
# Restart apache for new proxy config file

7
ipaserver/install/krainstance.py
View File

@ -77,7 +77,7 @@ class KRAInstance(DogtagInstance):
def configure_instance(self, realm_name, host_name, dm_password,
admin_password, pkcs12_info=None, master_host=None,
subject_base=None, subject=None,
ra_only=False, promote=False):
promote=False):
"""Create a KRA instance.
To create a clone, pass in pkcs12_info.
@ -99,7 +99,6 @@ class KRAInstance(DogtagInstance):
self.realm = realm_name
self.suffix = ipautil.realm_to_suffix(realm_name)
if not ra_only:
# Confirm that a KRA does not already exist
if self.is_installed():
raise RuntimeError(
@ -117,9 +116,9 @@ class KRAInstance(DogtagInstance):
if not self.clone:
self.step("create KRA agent",
self.__create_kra_agent)
if not ra_only:
if promote:
self.step("destroying installation admin user", self.teardown_admin)
self.step("destroying installation admin user",
self.teardown_admin)
self.step("restarting KRA", self.restart_instance)
self.step("configure certmonger for renewals",
self.configure_certmonger_renewal)