[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

Re: [Pki-devel] [PATCH] 70 Small changes to Installation summary for 10.0 branch#645



The following was agreed to be part of the installation summary after discussions on IRC.

    ==========================================================================
                                INSTALLATION SUMMARY
    ==========================================================================

      Administrator's username:             <user_name>
      Administrator's PKCS #12 file: (shown only when the file is generated)
            <---------p12 file path--------->

      Administrator's certificate nickname: <admin_nickname>  |
      Administrator's certificate database:                   |--- displayed only when database is not purged. 
            <---------database file path--------->            |

      To check the status of the subsystem: 
            systemctl status pki-tomcatd\@<instance_name>.service
      To restart the subsystem: 
            systemctl restart pki-tomcatd\@<instance_name>.service
      The URL for the subsystem is: 
            https://<host_name>:<host_ip>/<subsystem>

    ==========================================================================

Please review the patch attached for the same.

--Abhishek

----- Original Message -----
From: "Abhishek Koneru" <akoneru redhat com>
To: "pki-devel" <pki-devel redhat com>
Sent: Wednesday, July 17, 2013 5:25:36 PM
Subject: [Pki-devel] [PATCH] 70 Small changes to Installation summary for	10.0 branch#645

Please review the patch which adds the client dir to the installation
summary and some formatting.

Also should this patch be pushed to master?

--Abhishek

_______________________________________________
Pki-devel mailing list
Pki-devel redhat com
https://www.redhat.com/mailman/listinfo/pki-devel
From edd2f6b5ee86f4b33c9c66c3efd5e217062dc80b Mon Sep 17 00:00:00 2001
From: Abhishek Koneru <akoneru redhat com>
Date: Wed, 17 Jul 2013 17:17:07 -0400
Subject: [PATCH] Minor changes in Installation Summary.

Added pki client directory to the installation summary. Also
formatted the access url statement.

Ticket #645
---
 base/server/src/engine/pkimessages.py |   12 ++++++------
 base/server/src/pkispawn              |   11 ++++++++---
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/base/server/src/engine/pkimessages.py b/base/server/src/engine/pkimessages.py
index 5ee8bb840a162fbb358d90039019198d30c01216..154efb4f6a5ea60a47c3fbd9c1bd18db2a45b1b7 100644
--- a/base/server/src/engine/pkimessages.py
+++ b/base/server/src/engine/pkimessages.py
@@ -306,12 +306,12 @@ PKI_CONFIG_JAVA_CONFIGURATION_EXCEPTION = \
 PKI_CONFIG_RESPONSE_ADMIN_CERT = "adminCert:"
 PKI_CONFIG_RESPONSE_STATUS = "status:"
 PKI_CONFIG_NOT_YET_IMPLEMENTED_1 = " %s NOT YET IMPLEMENTED"
-PKI_CHECK_STATUS_MESSAGE = "    To check the status of the subsystem: \n"\
-"        systemctl status pki-tomcatd\ %s service"
-PKI_ACCESS_URL = "    The URL for the subsystem is https://%s:%s/%s";
-PKI_INSTANCE_RESTART_MESSAGE = "    To restart the subsystem: \n"\
-"        systemctl restart pki-tomcatd\ %s service"
-
+PKI_CHECK_STATUS_MESSAGE = "      To check the status of the subsystem: \n"\
+                           "            systemctl status pki-tomcatd\ %s service"
+PKI_ACCESS_URL = "      The URL for the subsystem is: \n"\
+                 "            https://%s:%s/%s";
+PKI_INSTANCE_RESTART_MESSAGE = "      To restart the subsystem: \n"\
+                               "            systemctl restart pki-tomcatd\ %s service"
 
 PKI_SPAWN_INFORMATION_HEADER = "\n    ==========================================================================\n"\
                                "                                INSTALLATION SUMMARY\n"\
diff --git a/base/server/src/pkispawn b/base/server/src/pkispawn
index 84b9b885ccaa329951503c7c028a23ca5f5e1991..44360644f0208403f18c3d8bec452b52e725bd1b 100755
--- a/base/server/src/pkispawn
+++ b/base/server/src/pkispawn
@@ -20,6 +20,7 @@
 #
 
 # System Imports
+import os
 import sys
 import signal
 
@@ -396,10 +397,14 @@ def print_install_information():
         print log.PKI_CONFIGURATION_RESTART_1 % \
               config.pki_master_dict['pki_registry_initscript_command']
     else:
-        print "    Admin username: %s" % config.pki_master_dict['pki_admin_uid']
+        print "      Administrator's username:             %s" % config.pki_master_dict['pki_admin_uid']
+        if os.path.isfile(config.pki_master_dict['pki_client_admin_cert_p12']):
+            print "      Administrator's PKCS #12 file:\n            %s" % (config.pki_master_dict['pki_client_dir'] + '/ca_admin_cert.p12')
         if not config.str2bool(config.pki_master_dict['pki_client_database_purge']):
-            print "    Location of client database: %s" % config.pki_master_dict['pki_client_database_dir']
-        print "    Client certificate nickname: %s" % config.pki_master_dict['pki_admin_nickname']
+            print
+            print "      Administrator's certificate nickname: %s" % config.pki_master_dict['pki_admin_nickname']
+            print "      Administrator's certificate database:\n            %s" % config.pki_master_dict['pki_client_database_dir']
+        print
         print log.PKI_CHECK_STATUS_MESSAGE % config.pki_master_dict['pki_instance_name']
         print log.PKI_INSTANCE_RESTART_MESSAGE % config.pki_master_dict['pki_instance_name']
         print log.PKI_ACCESS_URL % (config.pki_master_dict['pki_hostname'],
-- 
1.7.10.2


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]