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

replica: Fix ipa-replica-install with replica file (domain level 0).

Browse Source 
Attribute _ca_enabled is set in promote_check() and is not available in
install(). When installing replica in domain level 0 we can determine existence
of CA service based on existence of cacert.p12 file in provided replica-file.

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

Reviewed-By: Oleg Fayans <ofayans@redhat.com>
This commit is contained in:
David Kupka
2015-12-08 14:22:01 +01:00
committed by Jan Cholasta
parent dcb5c2a520
commit b7953cda4f
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
ipaserver/install/server/replicainstall.py
View File

@@ -654,6 +654,8 @@ def install(installer):
if installer._update_hosts_file:
installutils.update_hosts_file(config.ips, config.host_name, fstore)
ca_enabled = ipautil.file_exists(config.dir + "/cacert.p12")
# Create DS user/group if it doesn't exist yet
dsinstance.create_ds_user()
@@ -675,7 +677,7 @@ def install(installer):
ntp.create_instance()
# Configure dirsrv
ds = install_replica_ds(config, options, installer._ca_enabled)
ds = install_replica_ds(config, options, ca_enabled)
# Always try to install DNS records
install_dns_records(config, options, remote_api)
@@ -690,20 +692,20 @@ def install(installer):
options.domain_name = config.domain_name
options.host_name = config.host_name
if ipautil.file_exists(config.dir + "/cacert.p12"):
if ca_enabled:
options.ra_p12 = config.dir + "/ra.p12"
ca.install(False, config, options)
krb = install_krb(config, setup_pkinit=not options.no_pkinit)
http = install_http(config, auto_redirect=not options.no_ui_redirect,
ca_is_configured=installer._ca_enabled)
ca_is_configured=ca_enabled)
otpd = otpdinstance.OtpdInstance()
otpd.create_instance('OTPD', config.host_name, config.dirman_password,
ipautil.realm_to_suffix(config.realm_name))
if ipautil.file_exists(config.dir + "/cacert.p12"):
if ca_enabled:
CA = cainstance.CAInstance(config.realm_name, certs.NSS_DIR)
CA.dm_password = config.dirman_password