Fix self-signed replica installation

When a replica for self-signed server is being installed, the
installer crashes with "Not a dogtag CA installation". Make sure
that installation is handled correctly for both dogtag and
self-signed replicas.

https://fedorahosted.org/freeipa/ticket/1479
This commit is contained in:
Martin Kosek 2011-07-14 14:09:53 +02:00 committed by Rob Crittenden
parent aece880d8f
commit d802aa57f1
2 changed files with 6 additions and 2 deletions

View File

@ -134,6 +134,10 @@ def main():
# Configure the CA if necessary
(CA, cs) = cainstance.install_replica_ca(config, postinstall=True)
if not CA:
# not a dogtag CA replica
sys.exit("Not a dogtag CA installation!")
# We need to ldap_enable the CA now that DS is up and running
CA.ldap_enable('CA', config.host_name, config.dirman_password,
util.realm_to_suffix(config.realm_name))

View File

@ -1109,8 +1109,8 @@ def install_replica_ca(config, postinstall=False):
cafile = config.dir + "/cacert.p12"
if not ipautil.file_exists(cafile):
# not a dogtag CA replica
sys.exit('Not a dogtag CA installation')
# self-signed replica
return (None, None)
if not config.setup_ca:
# We aren't configuring the CA in this step but we still need