diff options
Diffstat (limited to 'base/server/sbin')
| -rwxr-xr-x | base/server/sbin/pkispawn | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/base/server/sbin/pkispawn b/base/server/sbin/pkispawn index fa14d4909..b019d8869 100755 --- a/base/server/sbin/pkispawn +++ b/base/server/sbin/pkispawn @@ -543,11 +543,7 @@ def main(argv): step_one = deployer.configuration_file.external_step_one if external and step_one: - external_csr_path = deployer.mdict['pki_external_csr_path'] - if external_csr_path: - print_external_ca_step_one_information(parser.mdict) - else: - print_existing_ca_step_one_information(parser.mdict) + print_external_ca_step_one_information(parser.mdict) else: print_install_information(parser.mdict) @@ -676,17 +672,6 @@ def print_external_ca_step_one_information(mdict): 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) - - def print_install_information(mdict): skip_configuration = config.str2bool(mdict['pki_skip_configuration']) |