IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2024-12-24 16:10:02 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix broken replica installation

Browse Source 
Make sure the subject base parameter is correctly passed and used during the
creation of the DS instance on a replica.

https://fedorahosted.org/freeipa/ticket/3868
This commit is contained in:
Ana Krivokapic 2013-08-19 17:45:31 +02:00 committed by Petr Viktorin
parent 78cf94a52c
commit c318213250
2 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
install/tools/ipa-replica-install
View File

@ -162,10 +162,16 @@ def install_replica_ds(config):
config.dir + "/dirsrv_pin.txt")
ds = dsinstance.DsInstance()
ds.create_replica(config.realm_name,
config.master_host_name, config.host_name,
config.domain_name, config.dirman_password,
pkcs12_info, ca_file = config.dir + "/ca.crt")
ds.create_replica(
realm_name=config.realm_name,
master_fqdn=config.master_host_name,
fqdn=config.host_name,
domain_name=config.domain_name,
dm_password=config.dirman_password,
subject_base=config.subject_base,
pkcs12_info=pkcs12_info,
ca_file=config.dir + "/ca.crt",
)
return ds

16
ipaserver/install/dsinstance.py
View File

@ -274,8 +274,8 @@ class DsInstance(service.Service):
self.start_creation(runtime=60)
def create_replica(self, realm_name, master_fqdn, fqdn,
domain_name, dm_password, pkcs12_info=None,
ca_file=None):
domain_name, dm_password, subject_base,
pkcs12_info=None, ca_file=None):
# idstart and idmax are configured so that the range is seen as
# depleted by the DNA plugin and the replica will go and get a
# new range from the master.
@ -284,8 +284,16 @@ class DsInstance(service.Service):
idmax = 1100
self.init_info(
realm_name, fqdn, domain_name, dm_password, None,
idstart, idmax, pkcs12_info, ca_file=ca_file)
realm_name=realm_name,
fqdn=fqdn,
domain_name=domain_name,
dm_password=dm_password,
subject_base=subject_base,
idstart=idstart,
idmax=idmax,
pkcs12_info=pkcs12_info,
ca_file=ca_file
)
self.master_fqdn = master_fqdn
self.__common_setup(True)