IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-01-12 17:21:55 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix ipa-replica-prepare's error message about missing local CA instance

Browse Source 
ipa-replica-prepare must be run on a replica with CA or all the certs
needs to be provided (for CA-less case).

The old messages were utterly confusing because they mixed errors about
missing certs and missing local CA instance into one text.

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

Reviewed-By: Martin Basti <mbasti@redhat.com>
Reviewed-By: Ben Lipton <blipton@redhat.com>
This commit is contained in:
Petr Spacek 2016-08-01 17:32:04 +02:00 committed by Martin Basti
parent cad6a551d6
commit 503d096ebc
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ipaserver/install/ipa_replica_prepare.py
View File

@ -236,6 +236,10 @@ class ReplicaPrepare(admintool.AdminTool):
except errors.DatabaseError as e: except errors.DatabaseError as e:
raise admintool.ScriptError(e.desc) raise admintool.ScriptError(e.desc)
if ca_enabled and not ipautil.file_exists(paths.CA_CS_CFG_PATH):
raise admintool.ScriptError(
"CA is not installed on this server. "
"ipa-replica-prepare must be run on an IPA server with CA.")
if not ca_enabled and not options.http_cert_files: if not ca_enabled and not options.http_cert_files:
raise admintool.ScriptError( raise admintool.ScriptError(
"Cannot issue certificates: a CA is not installed. Use the " "Cannot issue certificates: a CA is not installed. Use the "
@ -347,13 +351,6 @@ class ReplicaPrepare(admintool.AdminTool):
"Apache Server SSL certificate and Directory Server SSL " "Apache Server SSL certificate and Directory Server SSL "
"certificate are not signed by the same CA certificate") "certificate are not signed by the same CA certificate")
if (not ipautil.file_exists(paths.CA_CS_CFG_PATH) and
options.dirsrv_pin is None):
self.log.info("If you installed IPA with your own certificates "
"using PKCS#12 files you must provide PKCS#12 files for any "
"replicas you create as well.")
raise admintool.ScriptError("The replica must be created on the "
"primary IPA server.")
def run(self): def run(self):
options = self.options options = self.options