diff options
| author | Matthew Harmsen <mharmsen@pki.usersys.redhat.com> | 2015-04-13 14:59:29 -0600 |
|---|---|---|
| committer | Matthew Harmsen <mharmsen@pki.usersys.redhat.com> | 2015-04-13 14:59:29 -0600 |
| commit | 18b24a990ff9b97cf58aa630af0084975fe4c130 (patch) | |
| tree | 1dc97c105c772000f9bc17edfac5c84d30248f22 /base/server/sbin | |
| parent | e57a2d410d19d72e902bd1792e01f1f238f2ed63 (diff) | |
| download | pki-18b24a990ff9b97cf58aa630af0084975fe4c130.tar.gz pki-18b24a990ff9b97cf58aa630af0084975fe4c130.tar.xz pki-18b24a990ff9b97cf58aa630af0084975fe4c130.zip | |
pki-tomcatd fails to start on system boot
- PKI TRAC Ticket #1315 - pki-tomcatd fails to start on system boot
- PKI TRAC Ticket #1340 - pkidestroy should not remove /var/lib/pki
Diffstat (limited to 'base/server/sbin')
| -rwxr-xr-x | base/server/sbin/pkispawn | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/base/server/sbin/pkispawn b/base/server/sbin/pkispawn index edc14a6bc..55e87bba6 100755 --- a/base/server/sbin/pkispawn +++ b/base/server/sbin/pkispawn @@ -587,14 +587,19 @@ def print_install_information(mdict): not config.str2bool(mdict['pki_external_step_two'])): # Stand-alone PKI KRA/OCSP (External CA Step 1) print log.PKI_CONFIGURATION_STANDALONE_1 % config.pki_subsystem - elif (config.pki_subsystem == "TPS"): - print log.PKI_ACCESS_TPS_URL % (mdict['pki_hostname'], + else: + if (config.pki_subsystem == "TPS"): + print log.PKI_ACCESS_TPS_URL % (mdict['pki_hostname'], + mdict['pki_https_port'], + config.pki_subsystem.lower()) + else: + print log.PKI_ACCESS_URL % (mdict['pki_hostname'], mdict['pki_https_port'], config.pki_subsystem.lower()) - else: - print log.PKI_ACCESS_URL % (mdict['pki_hostname'], - mdict['pki_https_port'], - config.pki_subsystem.lower()) + if not config.str2bool(mdict['pki_enable_on_system_boot']): + print log.PKI_SYSTEM_BOOT_STATUS_MESSAGE % "disabled" + else: + print log.PKI_SYSTEM_BOOT_STATUS_MESSAGE % "enabled" print log.PKI_SPAWN_INFORMATION_FOOTER |