summaryrefslogtreecommitdiffstats
path: root/install/tools
diff options
context:
space:
mode:
authorMartin Babinsky <mbabinsk@redhat.com>2016-01-26 13:41:37 +0100
committerMartin Basti <mbasti@redhat.com>2016-01-28 16:33:15 +0100
commit72e72615df8b178ebbcb2e4944ba289ef263c951 (patch)
tree8cb19951645d57b929ce9b6c28788f774648bb15 /install/tools
parentd53c2f6b806335507ffd5e78be42471b85a39bbf (diff)
downloadfreeipa-72e72615df8b178ebbcb2e4944ba289ef263c951.tar.gz
freeipa-72e72615df8b178ebbcb2e4944ba289ef263c951.tar.xz
freeipa-72e72615df8b178ebbcb2e4944ba289ef263c951.zip
fix standalone installation of externally signed CA on IPA master
https://fedorahosted.org/freeipa/ticket/5636 Reviewed-By: Martin Basti <mbasti@redhat.com>
Diffstat (limited to 'install/tools')
-rwxr-xr-xinstall/tools/ipa-ca-install3
1 files changed, 2 insertions, 1 deletions
diff --git a/install/tools/ipa-ca-install b/install/tools/ipa-ca-install
index 83cf98ec6..1bc5def03 100755
--- a/install/tools/ipa-ca-install
+++ b/install/tools/ipa-ca-install
@@ -276,7 +276,8 @@ def main():
if not dsinstance.DsInstance().is_configured():
sys.exit("IPA server is not configured on this system.\n")
- 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.")
standard_logging_setup(paths.IPASERVER_CA_INSTALL_LOG, debug=options.debug)