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

install: Fix external CA server install

Browse Source 
https://fedorahosted.org/freeipa/ticket/4468

Reviewed-By: David Kupka <dkupka@redhat.com>
This commit is contained in:
Jan Cholasta 2015-06-08 08:32:58 +00:00
parent 90e400e57e
commit 4c70590c2a
2 changed files with 19 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
ipaserver/install/ca.py
View File

@ -25,9 +25,6 @@ def install_check(standalone, replica_config, options):
host_name = options.host_name host_name = options.host_name
subject_base = options.subject subject_base = options.subject
if replica_config is None and options.external_cert_files:
return
if replica_config is not None: if replica_config is not None:
if standalone and api.env.ra_plugin == 'selfsign': if standalone and api.env.ra_plugin == 'selfsign':
sys.exit('A selfsign CA can not be added') sys.exit('A selfsign CA can not be added')
@ -51,17 +48,7 @@ def install_check(standalone, replica_config, options):
if standalone and api.Command.ca_is_enabled()['result']: if standalone and api.Command.ca_is_enabled()['result']:
sys.exit("CA is already installed.\n") sys.exit("CA is already installed.\n")
if options.external_ca: if options.external_cert_files:
if cainstance.is_step_one_done():
print("CA is already installed.\nRun the installer with "
"--external-cert-file.")
sys.exit(1)
if ipautil.file_exists(paths.ROOT_IPA_CSR):
print("CA CSR file %s already exists.\nIn order to continue "
"remove the file and run the installer again." %
paths.ROOT_IPA_CSR)
sys.exit(1)
elif options.external_cert_files:
if not cainstance.is_step_one_done(): if not cainstance.is_step_one_done():
# This can happen if someone passes external_ca_file without # This can happen if someone passes external_ca_file without
# already having done the first stage of the CA install. # already having done the first stage of the CA install.
@ -72,10 +59,21 @@ def install_check(standalone, replica_config, options):
external_cert_file, external_ca_file = installutils.load_external_cert( external_cert_file, external_ca_file = installutils.load_external_cert(
options.external_cert_files, options.subject) options.external_cert_files, options.subject)
elif options.external_ca:
if cainstance.is_step_one_done():
print("CA is already installed.\nRun the installer with "
"--external-cert-file.")
sys.exit(1)
if ipautil.file_exists(paths.ROOT_IPA_CSR):
print("CA CSR file %s already exists.\nIn order to continue "
"remove the file and run the installer again." %
paths.ROOT_IPA_CSR)
sys.exit(1)
if not cainstance.check_port(): if not options.external_cert_files:
print ("IPA requires port 8443 for PKI but it is currently in use.") if not cainstance.check_port():
sys.exit("Aborting installation") print("IPA requires port 8443 for PKI but it is currently in use.")
sys.exit("Aborting installation")
if standalone: if standalone:
dirname = dsinstance.config_dirname( dirname = dsinstance.config_dirname(

7
ipaserver/install/server/install.py
View File

@ -422,8 +422,6 @@ def install_check(options):
# Make sure the 389-ds ports are available # Make sure the 389-ds ports are available
check_dirsrv(options.unattended) check_dirsrv(options.unattended)
ca.install_check(False, None, options)
if options.conf_ntp: if options.conf_ntp:
try: try:
ipaclient.ntpconf.check_timedate_services() ipaclient.ntpconf.check_timedate_services()
@ -578,6 +576,9 @@ def install_check(options):
else: else:
admin_password = options.admin_password admin_password = options.admin_password
if setup_ca:
ca.install_check(False, None, options)
if setup_kra: if setup_kra:
try: try:
kra.install_check(None, options, False, kra.install_check(None, options, False,
@ -760,7 +761,7 @@ def install(options):
options.subject, 1101, 1100, None) options.subject, 1101, 1100, None)
if setup_ca: if setup_ca:
if options.external_ca: if not options.external_cert_files and options.external_ca:
# stage 1 of external CA installation # stage 1 of external CA installation
options.realm_name = realm_name options.realm_name = realm_name
options.domain_name = domain_name options.domain_name = domain_name