summaryrefslogtreecommitdiffstats
path: root/base/server
diff options
context:
space:
mode:
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 dcdc48f3d..56a3fc47c 100644
--- a/base/server/config/pkislots.cfg
+++ b/base/server/config/pkislots.cfg
@@ -37,6 +37,7 @@ PKI_AGENT_CLIENTAUTH_SLOT=[PKI_AGENT_CLIENTAUTH]
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_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 f4ad2becd..9e92f53a7 100644
--- a/base/server/etc/default.cfg
+++ b/base/server/etc/default.cfg
@@ -79,6 +79,7 @@ pki_audit_signing_signing_algorithm=SHA256withRSA
pki_audit_signing_token=Internal Key Storage Token
pki_backup_keys=False
pki_backup_password=
+pki_ca_hostname=%(pki_security_domain_hostname)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 65eb2a457..cb202dd6b 100644
--- a/base/server/src/engine/pkiparser.py
+++ b/base/server/src/engine/pkiparser.py
@@ -654,6 +654,8 @@ class PKIConfigParser:
config.pki_master_dict['pki_ajp_port']
config.pki_master_dict['PKI_AJP_REDIRECT_PORT_SLOT'] =\
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_CERT_DB_PASSWORD_SLOT'] =\
config.pki_master_dict['pki_pin']
config.pki_master_dict['PKI_CFG_PATH_NAME_SLOT'] =\