summaryrefslogtreecommitdiffstats
path: root/base/server/python
diff options
context:
space:
mode:
authorAde Lee <alee@redhat.com>2016-08-02 11:18:31 -0400
committerAde Lee <alee@redhat.com>2016-08-02 11:20:17 -0400
commitad454dedb6ba7b5161f962fe65f78fb236c1a7fe (patch)
treef2479a4ddff19ac02f818920ed0239de2d6c94e9 /base/server/python
parentcbf3763e94516a20f3d5e39c66f85c9be96240c6 (diff)
downloadpki-ad454dedb6ba7b5161f962fe65f78fb236c1a7fe.tar.gz
pki-ad454dedb6ba7b5161f962fe65f78fb236c1a7fe.tar.xz
pki-ad454dedb6ba7b5161f962fe65f78fb236c1a7fe.zip
Fix deployment issue
Need to put pki_server_side_keygen in a conditional to avoid breaking other subsystem deployments. Ticket 2418
Diffstat (limited to 'base/server/python')
-rw-r--r--base/server/python/pki/server/deployment/pkiparser.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/base/server/python/pki/server/deployment/pkiparser.py b/base/server/python/pki/server/deployment/pkiparser.py
index 622f87e07..3e5d35575 100644
--- a/base/server/python/pki/server/deployment/pkiparser.py
+++ b/base/server/python/pki/server/deployment/pkiparser.py
@@ -941,8 +941,11 @@ class PKIConfigParser:
"tomcat"
self.mdict['PKI_WEBAPPS_NAME_SLOT'] = \
"webapps"
- self.mdict['SERVER_KEYGEN_SLOT'] = \
- self.mdict['pki_enable_server_side_keygen']
+
+ if self.mdict['pki_subsystem'] == "TPS":
+ 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'] = \