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

Add option to specify LDIF file that contains DS configuration changes

Browse Source 
This allows to user modify configuration changes of the directory server
instance during installation of DS

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

Also fixes:
https://fedorahosted.org/freeipa/ticket/4048
https://fedorahosted.org/freeipa/ticket/1930

Reviewed-By: Martin Babinsky <mbabinsk@redhat.com>
This commit is contained in:
Martin Basti
2015-10-08 10:38:44 +02:00
parent 65c89cc711
commit ae23432ef5
6 changed files with 64 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -87,7 +87,7 @@ def install_http_certs(config, fstore):
# FIXME: need Signing-Cert too ?
def install_replica_ds(config, promote=False):
def install_replica_ds(config, options, promote=False):
dsinstance.check_ports()
# if we have a pkcs12 file, create the cert db from
@@ -95,7 +95,8 @@ def install_replica_ds(config, promote=False):
# cert
pkcs12_info = make_pkcs12_info(config.dir, "dscert.p12", "dirsrv_pin.txt")
ds = dsinstance.DsInstance()
ds = dsinstance.DsInstance(
config_ldif=options.dirsrv_config_mods)
ds.create_replica(
realm_name=config.realm_name,
master_fqdn=config.master_host_name,
@@ -668,7 +669,7 @@ def install(installer):
ntp.create_instance()
# Configure dirsrv
ds = install_replica_ds(config)
ds = install_replica_ds(config, options)
# Always try to install DNS records
install_dns_records(config, options, remote_api)
@@ -1015,7 +1016,7 @@ def promote(installer):
ntp.create_instance()
# Configure dirsrv
ds = install_replica_ds(config, promote=True)
ds = install_replica_ds(config, options, promote=True)
# Always try to install DNS records
install_dns_records(config, options, api)