summaryrefslogtreecommitdiffstats
path: root/base/server
diff options
context:
space:
mode:
authorEndi Sukma Dewata <edewata@redhat.com>2013-05-24 02:34:13 -0400
committerEndi Sukma Dewata <edewata@redhat.com>2013-06-03 19:08:17 -0400
commitf9277f58629f5228f1717c3575e79d154da47858 (patch)
tree30b41dda169090c18df8a5d2e77d60f3d77303df /base/server
parent1bbcc9fab2f87f349f3b2d64a980b100c5c1707c (diff)
downloadpki-f9277f58629f5228f1717c3575e79d154da47858.tar.gz
pki-f9277f58629f5228f1717c3575e79d154da47858.tar.xz
pki-f9277f58629f5228f1717c3575e79d154da47858.zip
Renamed CA_PORT into PKI_CA_PORT.
The CA_PORT variable has been renamed into PKI_CA_PORT for consistency.
Diffstat (limited to 'base/server')
-rw-r--r--base/server/config/pkislots.cfg1
-rw-r--r--base/server/etc/default.cfg1
-rw-r--r--base/server/src/engine/pkiparser.py2
3 files changed, 4 insertions, 0 deletions
diff --git a/base/server/config/pkislots.cfg b/base/server/config/pkislots.cfg
index 56a3fc47c..0b239020f 100644
--- a/base/server/config/pkislots.cfg
+++ b/base/server/config/pkislots.cfg
@@ -38,6 +38,7 @@ PKI_AGENT_SECURE_PORT_SLOT=[PKI_AGENT_SECURE_PORT]
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]
diff --git a/base/server/etc/default.cfg b/base/server/etc/default.cfg
index 9e92f53a7..b2af83857 100644
--- a/base/server/etc/default.cfg
+++ b/base/server/etc/default.cfg
@@ -80,6 +80,7 @@ pki_audit_signing_token=Internal Key Storage Token
pki_backup_keys=False
pki_backup_password=
pki_ca_hostname=%(pki_security_domain_hostname)s
+pki_ca_port=%(pki_security_domain_https_port)s
pki_client_admin_cert_p12=%(pki_client_dir)s/%(pki_subsystem_type)s_admin_cert.p12
pki_client_database_password=
pki_client_database_purge=True
diff --git a/base/server/src/engine/pkiparser.py b/base/server/src/engine/pkiparser.py
index cb202dd6b..99c8855b9 100644
--- a/base/server/src/engine/pkiparser.py
+++ b/base/server/src/engine/pkiparser.py
@@ -656,6 +656,8 @@ class PKIConfigParser:
config.pki_master_dict['pki_https_port']
config.pki_master_dict['PKI_CA_HOSTNAME_SLOT'] =\
config.pki_master_dict['pki_ca_hostname']
+ config.pki_master_dict['PKI_CA_PORT_SLOT'] =\
+ config.pki_master_dict['pki_ca_port']
config.pki_master_dict['PKI_CERT_DB_PASSWORD_SLOT'] =\
config.pki_master_dict['pki_pin']
config.pki_master_dict['PKI_CFG_PATH_NAME_SLOT'] =\