Addresses Ticket 2418 - Some template substitution didn't happen during installation
(specifically SERVER_KEYGEN) Please review, Ade
From 27ffc1eb92232cba7816bdd50e8e8da288e6efad Mon Sep 17 00:00:00 2001 From: Ade Lee <a...@redhat.com> Date: Fri, 29 Jul 2016 12:23:39 +0100 Subject: [PATCH] Do slot substitution for SERVER_KEYGEN Ticket 2418 --- base/server/config/pkislots.cfg | 1 + base/server/python/pki/server/deployment/pkiparser.py | 2 ++ 2 files changed, 3 insertions(+) diff --git a/base/server/config/pkislots.cfg b/base/server/config/pkislots.cfg index 473b0da4e0b85bcd266cb64eebfc9b575c552f28..3873b83652e9fd0c9849dafcb1c50dcf5613e5c5 100644 --- a/base/server/config/pkislots.cfg +++ b/base/server/config/pkislots.cfg @@ -64,6 +64,7 @@ PKI_UNSECURE_PORT_SERVER_COMMENT_SLOT=[PKI_UNSECURE_PORT_SERVER_COMMENT] PKI_USER_SLOT=[PKI_USER] PKI_WEB_SERVER_TYPE_SLOT=[PKI_WEB_SERVER_TYPE] PKI_WEBAPPS_NAME_SLOT=[PKI_WEBAPPS_NAME] +SERVER_KEYGEN_SLOT=[SERVER_KEYGEN] TOKENDB_HOST_SLOT=[TOKENDB_HOST] TOKENDB_PORT_SLOT={TOKENDB_PORT] TOKENDB_ROOT_SLOT=[TOKENDB_ROOT] diff --git a/base/server/python/pki/server/deployment/pkiparser.py b/base/server/python/pki/server/deployment/pkiparser.py index d940e2c94cdbe937ba15d4d8cedc756390013aa2..622f87e0753c264daf021490b98a72d2ee7eddcd 100644 --- a/base/server/python/pki/server/deployment/pkiparser.py +++ b/base/server/python/pki/server/deployment/pkiparser.py @@ -941,6 +941,8 @@ class PKIConfigParser: "tomcat" self.mdict['PKI_WEBAPPS_NAME_SLOT'] = \ "webapps" + self.mdict['SERVER_KEYGEN_SLOT'] = \ + self.mdict['pki_enable_server_side_keygen'] self.mdict['TOMCAT_CFG_SLOT'] = \ self.mdict['pki_target_tomcat_conf'] self.mdict['TOMCAT_INSTANCE_COMMON_LIB_SLOT'] = \ -- 2.4.3
_______________________________________________ Pki-devel mailing list Pki-devel@redhat.com https://www.redhat.com/mailman/listinfo/pki-devel