From b7b945fb37b54426489bfe8f0be769ca4ee33860 Mon Sep 17 00:00:00 2001

From: "Endi S. Dewata" <edewata@redhat.com>

Date: Wed, 30 Mar 2016 04:29:11 +0200

Subject: [PATCH] Install tools clean-up.

Some variables in pkispawn and pkidestroy have been renamed for

clarity.

The unused PKI_CERT_DB_PASSWORD_SLOT variable has been removed.

The constant pki_self_signed_token property has been moved into

default.cfg.

https://fedorahosted.org/pki/ticket/2247

(cherry picked from commit 6b1aca96090874659d8a130aea802d41ecca180c)

(cherry picked from commit 631fa3ee228d44976416925ab3ee590075a54750)

---

 base/server/config/pkislots.cfg                       |  1 -

 base/server/etc/default.cfg                           |  1 +

 base/server/python/pki/server/deployment/pkiparser.py |  3 ---

 base/server/sbin/pkidestroy                           | 12 ++++++------

 base/server/sbin/pkispawn                             | 12 ++++++------

 5 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/base/server/config/pkislots.cfg b/base/server/config/pkislots.cfg

index 23c1f82..9265275 100644

--- a/base/server/config/pkislots.cfg

+++ b/base/server/config/pkislots.cfg

@@ -11,7 +11,6 @@ PKI_AJP_PORT_SLOT=[PKI_AJP_PORT]

 PKI_AJP_REDIRECT_PORT_SLOT=[PKI_AJP_REDIRECT_PORT]

 PKI_CA_HOSTNAME_SLOT=[PKI_CA_HOSTNAME]

 PKI_CA_PORT_SLOT=[PKI_CA_PORT]

-PKI_CERT_DB_PASSWORD_SLOT=[PKI_CERT_DB_PASSWORD]

 PKI_CFG_PATH_NAME_SLOT=[PKI_CFG_PATH_NAME]

 PKI_CLOSE_AJP_PORT_COMMENT_SLOT=[PKI_CLOSE_AJP_PORT_COMMENT]

 PKI_CLOSE_ENABLE_PROXY_COMMENT_SLOT=[PKI_CLOSE_ENABLE_PROXY_COMMENT]

diff --git a/base/server/etc/default.cfg b/base/server/etc/default.cfg

index 1c1ae92..9bc27cb 100644

--- a/base/server/etc/default.cfg

+++ b/base/server/etc/default.cfg

@@ -108,6 +108,7 @@ pki_security_domain_https_port=8443

 pki_security_domain_name=%(pki_dns_domainname)s Security Domain

 pki_security_domain_password=

 pki_security_domain_user=caadmin

+pki_self_signed_token=internal

 #for supporting server cert SAN injection

 pki_san_inject=False

 pki_san_for_server_cert=

diff --git a/base/server/python/pki/server/deployment/pkiparser.py b/base/server/python/pki/server/deployment/pkiparser.py

index 69a900e..0c5fd74 100644

--- a/base/server/python/pki/server/deployment/pkiparser.py

+++ b/base/server/python/pki/server/deployment/pkiparser.py

@@ -781,8 +781,6 @@ class PKIConfigParser:

                 self.mdict['pki_ca_hostname']

             self.mdict['PKI_CA_PORT_SLOT'] = \

                 self.mdict['pki_ca_port']

-            self.mdict['PKI_CERT_DB_PASSWORD_SLOT'] = \

-                self.mdict['pki_pin']

             self.mdict['PKI_CFG_PATH_NAME_SLOT'] = \

                 self.mdict['pki_target_cs_cfg']

             self.mdict['PKI_CLOSE_SEPARATE_PORTS_SERVER_COMMENT_SLOT'] = \

@@ -1095,7 +1093,6 @@ class PKIConfigParser:

             self.mdict['pki_secmod_database'] = \

                 os.path.join(self.mdict['pki_database_path'],

                              "secmod.db")

-            self.mdict['pki_self_signed_token'] = "internal"

             self.mdict['pki_self_signed_nickname'] = \

                 self.mdict['pki_ssl_server_nickname']

             self.mdict['pki_self_signed_subject'] = \

diff --git a/base/server/sbin/pkidestroy b/base/server/sbin/pkidestroy

index 459b755..cf4d353 100755

--- a/base/server/sbin/pkidestroy

+++ b/base/server/sbin/pkidestroy

@@ -257,12 +257,12 @@ def main(argv):

     pki_subsystem_scriptlets = parser.mdict['destroy_scriplets'].split()

     deployer = util.PKIDeployer(parser.mdict)

     rv = 0

-    for pki_scriptlet in pki_subsystem_scriptlets:

-        scriptlet = __import__("pki.server.deployment.scriptlets." +

-                               pki_scriptlet,

-                               fromlist=[pki_scriptlet])

-        instance = scriptlet.PkiScriptlet()

-        rv = instance.destroy(deployer)

+    for scriptlet_name in pki_subsystem_scriptlets:

+        scriptlet_module = __import__(

+            "pki.server.deployment.scriptlets." + scriptlet_name,

+            fromlist=[scriptlet_name])

+        scriptlet = scriptlet_module.PkiScriptlet()

+        rv = scriptlet.destroy(deployer)

         if rv != 0:

             sys.exit(1)

     config.pki_log.debug(log.PKI_DICTIONARY_MASTER,

diff --git a/base/server/sbin/pkispawn b/base/server/sbin/pkispawn

index f362b9e..06b9a44 100755

--- a/base/server/sbin/pkispawn

+++ b/base/server/sbin/pkispawn

@@ -588,13 +588,13 @@ def main(argv):

     pki_subsystem_scriptlets = parser.mdict['spawn_scriplets'].split()

     deployer = util.PKIDeployer(parser.mdict, parser.slots_dict)

     rv = 0

-    for pki_scriptlet in pki_subsystem_scriptlets:

-        scriptlet = __import__("pki.server.deployment.scriptlets." +

-                               pki_scriptlet,

-                               fromlist=[pki_scriptlet])

-        instance = scriptlet.PkiScriptlet()

+    for scriptlet_name in pki_subsystem_scriptlets:

+        scriptlet_module = __import__(

+            "pki.server.deployment.scriptlets." + scriptlet_name,

+            fromlist=[scriptlet_name])

+        scriptlet = scriptlet_module.PkiScriptlet()

         try:

-            rv = instance.spawn(deployer)

+            rv = scriptlet.spawn(deployer)

         # pylint: disable=W0703

         except Exception:

             log_error_details()

-- 

2.5.5