summaryrefslogtreecommitdiffstats
path: root/ipaserver/install/server/install.py
diff options
context:
space:
mode:
authorJan Cholasta <jcholast@redhat.com>2015-06-08 08:32:58 +0000
committerJan Cholasta <jcholast@redhat.com>2015-06-08 15:32:33 +0000
commit4c70590c2a78b6d2cbfed585502442f733f26389 (patch)
tree9b4a98df249c431e7121c1e4e957af5f58e6e158 /ipaserver/install/server/install.py
parent90e400e57e1dd36d72808aa9bd54be8139b2c741 (diff)
downloadfreeipa-4c70590c2a78b6d2cbfed585502442f733f26389.tar.gz
freeipa-4c70590c2a78b6d2cbfed585502442f733f26389.tar.xz
freeipa-4c70590c2a78b6d2cbfed585502442f733f26389.zip
install: Fix external CA server install
https://fedorahosted.org/freeipa/ticket/4468 Reviewed-By: David Kupka <dkupka@redhat.com>
Diffstat (limited to 'ipaserver/install/server/install.py')
-rw-r--r--ipaserver/install/server/install.py7
1 files changed, 4 insertions, 3 deletions
diff --git a/ipaserver/install/server/install.py b/ipaserver/install/server/install.py
index 6f47723bb..faa96127a 100644
--- a/ipaserver/install/server/install.py
+++ b/ipaserver/install/server/install.py
@@ -422,8 +422,6 @@ def install_check(options):
# Make sure the 389-ds ports are available
check_dirsrv(options.unattended)
- ca.install_check(False, None, options)
-
if options.conf_ntp:
try:
ipaclient.ntpconf.check_timedate_services()
@@ -578,6 +576,9 @@ def install_check(options):
else:
admin_password = options.admin_password
+ if setup_ca:
+ ca.install_check(False, None, options)
+
if setup_kra:
try:
kra.install_check(None, options, False,
@@ -760,7 +761,7 @@ def install(options):
options.subject, 1101, 1100, None)
if setup_ca:
- if options.external_ca:
+ if not options.external_cert_files and options.external_ca:
# stage 1 of external CA installation
options.realm_name = realm_name
options.domain_name = domain_name