IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2024-12-25 08:21:05 -06:00
Code Issues Packages Projects Releases Wiki Activity

Check early if a CA is already installed locally

Browse Source 
There is no reason to proceed if a CA is already installed, and the
check does not involve a lot of setup, so do it early on.

Ticket: https://fedorahosted.org/freeipa/ticket/5397

Signed-off-by: Simo Sorce <simo@redhat.com>
Reviewed-By: Martin Basti <mbasti@redhat.com>
This commit is contained in:
Simo Sorce 2015-10-23 11:21:01 -04:00 committed by Martin Basti
parent c38516eab7
commit 53294aa7a7
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
install/tools/ipa-ca-install
View File

@ -231,6 +231,9 @@ def main():
if not dsinstance.DsInstance().is_configured(): if not dsinstance.DsInstance().is_configured():
sys.exit("IPA server is not configured on this system.\n") sys.exit("IPA server is not configured on this system.\n")
if cainstance.is_ca_installed_locally():
sys.exit("CA is already installed on this host.")
standard_logging_setup(paths.IPASERVER_CA_INSTALL_LOG, debug=options.debug) standard_logging_setup(paths.IPASERVER_CA_INSTALL_LOG, debug=options.debug)
root_logger.debug("%s was invoked with options: %s,%s", root_logger.debug("%s was invoked with options: %s,%s",
sys.argv[0], safe_options, filename) sys.argv[0], safe_options, filename)

4
ipaserver/install/ca.py
View File

@ -52,9 +52,7 @@ def install_check(standalone, replica_config, options):
return return
if standalone: if standalone:
if cainstance.is_ca_installed_locally(): if api.Command.ca_is_enabled()['result']:
sys.exit("CA is already installed on this host.")
elif api.Command.ca_is_enabled()['result']:
sys.exit( sys.exit(
"One or more CA masters are already present in IPA realm " "One or more CA masters are already present in IPA realm "
"'%s'.\nIf you wish to replicate CA to this host, please " "'%s'.\nIf you wish to replicate CA to this host, please "