From e22cf5bafc4c862a16bd8ac0b950c7547b048ae9 Mon Sep 17 00:00:00 2001 From: Jan Cholasta Date: Wed, 22 Oct 2014 11:18:35 +0200 Subject: [PATCH] Do not check if port 8443 is available in step 2 of external CA install The port is never available in step 2 of external CA install, as Dogtag is already running. https://fedorahosted.org/freeipa/ticket/4660 Reviewed-By: David Kupka --- install/tools/ipa-ca-install | 3 ++- install/tools/ipa-server-install | 9 +++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/install/tools/ipa-ca-install b/install/tools/ipa-ca-install index cb072e6789401f7041cafe926d7f88b2bb7f479d..1bda22dd66729999176c301af2f9b05843eff75c 100755 --- a/install/tools/ipa-ca-install +++ b/install/tools/ipa-ca-install @@ -301,7 +301,8 @@ def install_master(safe_options, options): domain_name = api.env.domain host_name = api.env.host - check_ca() + if external != 2: + check_ca() dirname = dsinstance.config_dirname( dsinstance.realm_to_serverid(realm_name)) diff --git a/install/tools/ipa-server-install b/install/tools/ipa-server-install index 0394314ee99817f221536136ae1432cc8e92220a..67dd21f302db0eba94d048cb064caf8a1f054b83 100755 --- a/install/tools/ipa-server-install +++ b/install/tools/ipa-server-install @@ -869,10 +869,11 @@ def main(): # Make sure the 389-ds ports are available check_dirsrv(options.unattended) - if setup_ca: - if not cainstance.check_port(): - print "IPA requires port 8443 for PKI but it is currently in use." - sys.exit("Aborting installation") + if setup_ca: + if not cainstance.check_port(): + print ("IPA requires port 8443 for PKI but it is currently in " + "use.") + sys.exit("Aborting installation") if options.conf_ntp: try: -- 1.9.3