summaryrefslogtreecommitdiffstats
path: root/base/server/python/pki/server/deployment/pkiparser.py
diff options
context:
space:
mode:
authorMatthew Harmsen <mharmsen@redhat.com>2013-10-25 09:58:42 -0700
committerMatthew Harmsen <mharmsen@redhat.com>2013-10-25 10:00:43 -0700
commitbabc5111c40442e247c99e248832839b15359573 (patch)
treebed2f8bbaae99b9fed0e2ecf00ce5af944a8d92e /base/server/python/pki/server/deployment/pkiparser.py
parent47c77a67d67cb443070137fd9b8d64955d499089 (diff)
downloadpki-babc5111c40442e247c99e248832839b15359573.tar.gz
pki-babc5111c40442e247c99e248832839b15359573.tar.xz
pki-babc5111c40442e247c99e248832839b15359573.zip
Stand-alone DRM
* TRAC Ticket #762 - Stand-alone DRM (cleanup tasks)
Diffstat (limited to 'base/server/python/pki/server/deployment/pkiparser.py')
-rw-r--r--base/server/python/pki/server/deployment/pkiparser.py13
1 files changed, 13 insertions, 0 deletions
diff --git a/base/server/python/pki/server/deployment/pkiparser.py b/base/server/python/pki/server/deployment/pkiparser.py
index 77004b737..b7cece722 100644
--- a/base/server/python/pki/server/deployment/pkiparser.py
+++ b/base/server/python/pki/server/deployment/pkiparser.py
@@ -536,6 +536,9 @@ class PKIConfigParser:
pkilogging.sensitive_parameters = self.pki_master_dict['sensitive_parameters'].split()
# Always create "false" values for these missing "boolean" keys
+ if not self.pki_master_dict.has_key('pki_enable_access_log') or\
+ not len(self.pki_master_dict['pki_enable_access_log']):
+ self.pki_master_dict['pki_enable_access_log'] = "false"
if not self.pki_master_dict.has_key('pki_external') or\
not len(self.pki_master_dict['pki_external']):
self.pki_master_dict['pki_external'] = "false"
@@ -834,6 +837,16 @@ class PKIConfigParser:
self.pki_master_dict['PKI_OPEN_STANDALONE_COMMENT_SLOT'] = \
"<!--"
self.pki_master_dict['PKI_STANDALONE_SLOT'] = "false"
+ if (config.str2bool(self.pki_master_dict['pki_enable_access_log'])):
+ self.pki_master_dict['PKI_CLOSE_TOMCAT_ACCESS_LOG_COMMENT_SLOT'] = \
+ ""
+ self.pki_master_dict['PKI_OPEN_TOMCAT_ACCESS_LOG_COMMENT_SLOT'] = \
+ ""
+ else:
+ self.pki_master_dict['PKI_CLOSE_TOMCAT_ACCESS_LOG_COMMENT_SLOT'] = \
+ "-->"
+ self.pki_master_dict['PKI_OPEN_TOMCAT_ACCESS_LOG_COMMENT_SLOT'] = \
+ "<!--"
self.pki_master_dict['PKI_TMPDIR_SLOT'] = \
self.pki_master_dict['pki_tomcat_tmpdir_path']
self.pki_master_dict['PKI_RESTEASY_LIB_SLOT'] = \