pgreco / rpms / ipa

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

Blame SOURCES/0188-fix-standalone-installation-of-externally-signed-CA-.patch

aa60fb
From 06c2e339f28ab697c830dc1f9d6ef89b833b2d1a Mon Sep 17 00:00:00 2001
aa60fb
From: Martin Babinsky <mbabinsk@redhat.com>
aa60fb
Date: Tue, 26 Jan 2016 13:02:44 +0100
aa60fb
Subject: [PATCH] fix standalone installation of externally signed CA on IPA
aa60fb
 master
aa60fb
aa60fb
https://fedorahosted.org/freeipa/ticket/5636
aa60fb
aa60fb
Reviewed-By: Martin Basti <mbasti@redhat.com>
aa60fb
---
aa60fb
 ipaserver/install/ca.py | 3 ++-
aa60fb
 1 file changed, 2 insertions(+), 1 deletion(-)
aa60fb
aa60fb
diff --git a/ipaserver/install/ca.py b/ipaserver/install/ca.py
aa60fb
index 84cbf423246534259cd6b7a8cca25caa16e5594f..d2fb5feeaf96e8450eddb1bc4e65ef3316b05b38 100644
aa60fb
--- a/ipaserver/install/ca.py
aa60fb
+++ b/ipaserver/install/ca.py
aa60fb
@@ -46,7 +46,8 @@ def install_check(standalone, replica_config, options):
aa60fb
         return
aa60fb
 
aa60fb
     if standalone:
aa60fb
-        if cainstance.is_ca_installed_locally():
aa60fb
+        if (not options.external_cert_files and
aa60fb
+                cainstance.is_ca_installed_locally()):
aa60fb
             sys.exit("CA is already installed on this host.")
aa60fb
         elif api.Command.ca_is_enabled()['result']:
aa60fb
             sys.exit(
aa60fb
-- 
aa60fb
2.5.0
aa60fb