pgreco / rpms / ipa

Forked from forks/areguera/rpms/ipa 4 years ago
Clone
Blob Blame History Raw
From 06c2e339f28ab697c830dc1f9d6ef89b833b2d1a Mon Sep 17 00:00:00 2001
From: Martin Babinsky <mbabinsk@redhat.com>
Date: Tue, 26 Jan 2016 13:02:44 +0100
Subject: [PATCH] fix standalone installation of externally signed CA on IPA
 master

https://fedorahosted.org/freeipa/ticket/5636

Reviewed-By: Martin Basti <mbasti@redhat.com>
---
 ipaserver/install/ca.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ipaserver/install/ca.py b/ipaserver/install/ca.py
index 84cbf423246534259cd6b7a8cca25caa16e5594f..d2fb5feeaf96e8450eddb1bc4e65ef3316b05b38 100644
--- a/ipaserver/install/ca.py
+++ b/ipaserver/install/ca.py
@@ -46,7 +46,8 @@ def install_check(standalone, replica_config, options):
         return
 
     if standalone:
-        if cainstance.is_ca_installed_locally():
+        if (not options.external_cert_files and
+                cainstance.is_ca_installed_locally()):
             sys.exit("CA is already installed on this host.")
         elif api.Command.ca_is_enabled()['result']:
             sys.exit(
-- 
2.5.0