diff options
Diffstat (limited to 'base/server')
| -rw-r--r-- | base/server/config/pkislots.cfg | 1 | ||||
| -rw-r--r-- | base/server/etc/pki.conf | 2 | ||||
| -rw-r--r-- | base/server/src/engine/pkiparser.py | 7 |
3 files changed, 9 insertions, 1 deletions
diff --git a/base/server/config/pkislots.cfg b/base/server/config/pkislots.cfg index 1cb463bfe..a2a661f24 100644 --- a/base/server/config/pkislots.cfg +++ b/base/server/config/pkislots.cfg @@ -28,6 +28,7 @@ SYSTEM_USER_LIBRARIES_SLOT=[SYSTEM_USER_LIBRARIES] TMP_DIR_SLOT=[TMP_DIR] TPS_DIR_SLOT=[TPS_DIR] [Tomcat] +application_version=[APPLICATION_VERSION] INSTALL_TIME_SLOT=[INSTALL_TIME] PKI_ADMIN_SECURE_PORT_SLOT=[PKI_ADMIN_SECURE_PORT] PKI_ADMIN_SECURE_PORT_CONNECTOR_NAME_SLOT=[PKI_ADMIN_SECURE_PORT_CONNECTOR_NAME] diff --git a/base/server/etc/pki.conf b/base/server/etc/pki.conf index 24decec52..c7f4f8470 100644 --- a/base/server/etc/pki.conf +++ b/base/server/etc/pki.conf @@ -2,3 +2,5 @@ RESTEASY_LIB=${RESTEASY_LIB} # JNI jar file location JNI_JAR_DIR=${JNI_JAR_DIR} + +PKI_VERSION=${APPLICATION_VERSION} diff --git a/base/server/src/engine/pkiparser.py b/base/server/src/engine/pkiparser.py index 047e8614e..8fcac77ca 100644 --- a/base/server/src/engine/pkiparser.py +++ b/base/server/src/engine/pkiparser.py @@ -33,7 +33,9 @@ import sys import time -# PKI Deployment Imports +# PKI Imports +import pki +import pki.upgrade import pkilogging import pkiconfig as config import pkimessages as log @@ -180,7 +182,10 @@ class PKIConfigParser: default_http_port = '80' default_https_port = '443' + application_version = str(pki.upgrade.Version(pki.implementation_version())) + self.pki_config = ConfigParser.SafeConfigParser({ + 'application_version': application_version, 'pki_instance_name': default_instance_name, 'pki_http_port': default_http_port, 'pki_https_port': default_https_port, |