pgreco / rpms / ipa

Forked from forks/areguera/rpms/ipa 4 years ago
Clone

Blame SOURCES/0001-Do-not-check-if-port-8443-is-available-in-step-2-of-.patch

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