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

[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
>From bdd518eff15577c110361f07382d609b591dcfb8 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 |   11 ++++++-----
 base/server/src/pkispawn              |    7 ++++---
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/base/server/src/engine/pkimessages.py b/base/server/src/engine/pkimessages.py
index 5ee8bb840a162fbb358d90039019198d30c01216..c414e2698222bf0fed985d1b343f5cd1f66c7419 100644
--- a/base/server/src/engine/pkimessages.py
+++ b/base/server/src/engine/pkimessages.py
@@ -306,11 +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"\
diff --git a/base/server/src/pkispawn b/base/server/src/pkispawn
index 84b9b885ccaa329951503c7c028a23ca5f5e1991..767e3c482a32d101635829734747810cffc4d549 100755
--- a/base/server/src/pkispawn
+++ b/base/server/src/pkispawn
@@ -396,10 +396,11 @@ 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 "      Admin username: %s" % config.pki_master_dict['pki_admin_uid']
         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 "      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 "      Client folder: %s" % config.pki_master_dict['pki_client_dir']
         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]