Please review the attached patch which addresses:
* PKI TRAC Ticket #856 - Incorrect clone installation summary
<https://fedorahosted.org/pki/ticket/856>
The patch was tested by installing a 'pki-tomcat' CA master:
==========================================================================
INSTALLATION SUMMARY
==========================================================================
Administrator's username: caadmin
Administrator's PKCS #12 file:
/root/.dogtag/pki-tomcat/ca_admin_cert.p12
Administrator's certificate database:
/root/.dogtag/pki-tomcat/ca/alias
To check the status of the subsystem:
systemctl status pki-tomcatd@pki-tomcat.service
To restart the subsystem:
systemctl restart pki-tomcatd@pki-tomcat.service
The URL for the subsystem is:
https://pki.example.com:8443/ca
PKI instances will be enabled upon system boot
==========================================================================
and a 'pki-tomcat-ca-clone' CA clone on the same machine
('pki.example.com'):
==========================================================================
INSTALLATION SUMMARY
==========================================================================
Administrator's username: caadmin
This CA subsystem of the 'pki-tomcat-ca-clone' instance
is a clone.
To check the status of the subsystem:
systemctl status pki-tomcatd@pki-tomcat-ca-clone.service
To restart the subsystem:
systemctl restart pki-tomcatd@pki-tomcat-ca-clone.service
The URL for the subsystem is:
https://pki.example.com:17443/ca
PKI instances will be enabled upon system boot
==========================================================================
From a1cea7368bb4232092adce1f31b25fcbd55de6de Mon Sep 17 00:00:00 2001
From: Matthew Harmsen <mharm...@pki.usersys.redhat.com>
Date: Wed, 27 Apr 2016 15:26:36 -0600
Subject: [PATCH] Fixed incorrect clone installation summary
- PKI TRAC Ticket #856 - Incorrect clone installation summary
---
base/server/sbin/pkispawn | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/base/server/sbin/pkispawn b/base/server/sbin/pkispawn
index caa5e9b..594d783 100755
--- a/base/server/sbin/pkispawn
+++ b/base/server/sbin/pkispawn
@@ -704,8 +704,14 @@ def print_install_information(mdict):
print()
print(" Administrator's certificate nickname:\n %s"
% mdict['pki_admin_nickname'])
+ if not config.str2bool(mdict['pki_clone']):
print(" Administrator's certificate database:\n %s"
% mdict['pki_client_database_dir'])
+ else:
+ print()
+ print(" This %s subsystem of the '%s' instance\n"
+ " is a clone." %
+ (config.pki_subsystem, mdict['pki_instance_name']))
print(log.PKI_CHECK_STATUS_MESSAGE % mdict['pki_instance_name'])
print(log.PKI_INSTANCE_RESTART_MESSAGE % mdict['pki_instance_name'])
if (((config.pki_subsystem == "KRA" or
--
2.5.5
_______________________________________________
Pki-devel mailing list
Pki-devel@redhat.com
https://www.redhat.com/mailman/listinfo/pki-devel
