From 5207fe7a28462f24ba47301a717af15057f3be0e Mon Sep 17 00:00:00 2001 From: "Endi S. Dewata" Date: Fri, 22 Jan 2016 00:03:39 +0100 Subject: Fixed installation summary for existing CA. The pkispawn has been modified to display the proper summary for external CA and existing CA cases. https://fedorahosted.org/pki/ticket/456 (cherry picked from commit 66a4b7e635a4456a102221049c58c461d3429093) --- base/server/sbin/pkispawn | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) (limited to 'base/server/sbin/pkispawn') diff --git a/base/server/sbin/pkispawn b/base/server/sbin/pkispawn index 3b09e0f20..967d5f5e5 100755 --- a/base/server/sbin/pkispawn +++ b/base/server/sbin/pkispawn @@ -613,9 +613,13 @@ def main(argv): external = deployer.configuration_file.external step_one = deployer.configuration_file.external_step_one + external_csr_path = deployer.configuration_file.external_csr_path if external and step_one: - print_step_one_information(parser.mdict) + if external_csr_path: + print_external_ca_step_one_information(parser.mdict) + else: + print_existing_ca_step_one_information(parser.mdict) else: print_install_information(parser.mdict) @@ -627,7 +631,7 @@ def set_port(parser, tag, prompt, existing_data): parser.read_text(prompt, config.pki_subsystem, tag) -def print_step_one_information(mdict): +def print_external_ca_step_one_information(mdict): print(log.PKI_SPAWN_INFORMATION_HEADER) print(" The %s subsystem of the '%s' instance is still incomplete." % @@ -638,7 +642,19 @@ def print_step_one_information(mdict): % mdict['pki_external_csr_path']) print() print(" Submit the CSR to an external CA to generate a CA certificate\n" - " for this subsystem.") + " for this subsystem. Import the CA certificate and the certificate\n" + " chain, then continue the installation.") + print(log.PKI_SPAWN_INFORMATION_FOOTER) + + +def print_existing_ca_step_one_information(mdict): + + print(log.PKI_SPAWN_INFORMATION_HEADER) + print(" The %s subsystem of the '%s' instance is still incomplete." % + (config.pki_subsystem, mdict['pki_instance_name'])) + print() + print(" Import an existing CA certificate with the key and the CSR, and\n" + " the certificate chain if available, then continue the installation.") print(log.PKI_SPAWN_INFORMATION_FOOTER) -- cgit