diff options
author | Endi Sukma Dewata <edewata@redhat.com> | 2013-05-24 02:09:40 -0400 |
---|---|---|
committer | Endi Sukma Dewata <edewata@redhat.com> | 2013-06-03 16:44:49 -0400 |
commit | 1bbcc9fab2f87f349f3b2d64a980b100c5c1707c (patch) | |
tree | 26a10f0403752dafb8ada90214da4d6fb9b58cb3 /base | |
parent | f461a86d1bfcd53ac1dd14c2637e293570b35e63 (diff) | |
download | pki-1bbcc9fab2f87f349f3b2d64a980b100c5c1707c.tar.gz pki-1bbcc9fab2f87f349f3b2d64a980b100c5c1707c.tar.xz pki-1bbcc9fab2f87f349f3b2d64a980b100c5c1707c.zip |
Renamed CA_HOST into PKI_CA_HOSTNAME.
The CA_HOST variable has been renamed into PKI_CA_HOSTNAME
for consistency.
Diffstat (limited to 'base')
-rw-r--r-- | base/ra/shared/conf/CS.cfg.in | 2 | ||||
-rw-r--r-- | base/server/config/pkislots.cfg | 1 | ||||
-rw-r--r-- | base/server/etc/default.cfg | 1 | ||||
-rw-r--r-- | base/server/src/engine/pkiparser.py | 2 | ||||
-rwxr-xr-x | base/tps/setup/create.pl | 6 | ||||
-rw-r--r-- | base/tps/shared/conf/CS.cfg.in | 2 |
6 files changed, 9 insertions, 5 deletions
diff --git a/base/ra/shared/conf/CS.cfg.in b/base/ra/shared/conf/CS.cfg.in index 8290eea0f..3a2a11af0 100644 --- a/base/ra/shared/conf/CS.cfg.in +++ b/base/ra/shared/conf/CS.cfg.in @@ -179,7 +179,7 @@ conn.ca1._020=# where conn.ca1._021=# <n> - CA connection ID conn.ca1._022=######################################### failover.pod.enable=false -conn.ca1.hostport=[CA_HOST]:[CA_PORT] +conn.ca1.hostport=[PKI_CA_HOSTNAME]:[CA_PORT] conn.ca1.clientNickname=[HSM_LABEL][NICKNAME] conn.ca1.servlet.enrollment=/ca/ee/ca/profileSubmitSSLClient conn.ca1.servlet.addagent=/ca/admin/ca/registerRaUser 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'] =\ diff --git a/base/tps/setup/create.pl b/base/tps/setup/create.pl index 8082d5847..4b88bc6cd 100755 --- a/base/tps/setup/create.pl +++ b/base/tps/setup/create.pl @@ -288,14 +288,14 @@ ASK_AUTH_ROOT: print ("************************************************\n"); print ("\n"); -ASK_CA_HOST: +ASK_PKI_CA_HOSTNAME: print ("Enter the hostname of the CA [$defaultServerName]: "); chomp ($caHost = <STDIN>); if ($caHost eq "") { $caHost = "$defaultServerName"; } if ($caHost eq "") { - goto ASK_CA_HOST; + goto ASK_PKI_CA_HOSTNAME; } ASK_CA_PORT: @@ -692,7 +692,7 @@ sub CopyTemplate s/\[TUS_PORT\]/$tusPort/g; s/\[TUS_ROOT\]/$tusRoot/g; s/\[TUS_PASS\]/$tusPass/g; - s/\[CA_HOST\]/$caHost/g; + s/\[PKI_CA_HOSTNAME\]/$caHost/g; s/\[CA_PORT\]/$caPort/g; s/\[DRM_HOST\]/$drmHost/g; s/\[DRM_PORT\]/$drmPort/g; diff --git a/base/tps/shared/conf/CS.cfg.in b/base/tps/shared/conf/CS.cfg.in index b5421b162..fcf817695 100644 --- a/base/tps/shared/conf/CS.cfg.in +++ b/base/tps/shared/conf/CS.cfg.in @@ -150,7 +150,7 @@ conn.ca1._028=# where conn.ca1._029=# <n> - CA connection ID conn.ca1._030=######################################### failover.pod.enable=false -conn.ca1.hostport=[CA_HOST]:[CA_PORT] +conn.ca1.hostport=[PKI_CA_HOSTNAME]:[CA_PORT] conn.ca1.clientNickname=[HSM_LABEL][NICKNAME] conn.ca1.servlet.enrollment=/ca/ee/ca/profileSubmitSSLClient conn.ca1.servlet.renewal=/ca/ee/ca/profileSubmitSSLClient |