diff options
| author | Endi Sukma Dewata <edewata@redhat.com> | 2013-05-20 22:59:15 -0400 |
|---|---|---|
| committer | Endi Sukma Dewata <edewata@redhat.com> | 2013-05-30 12:00:36 -0400 |
| commit | d78d7442be02b6b83d9dad3fc089fa9f9d8ceb48 (patch) | |
| tree | 27816db3b38935f4e4c05bdfd5f347fd7ec4669e /base/tks | |
| parent | 1d53a9dd567f395bcaf65376be9f6c3319ba51ce (diff) | |
| download | pki-d78d7442be02b6b83d9dad3fc089fa9f9d8ceb48.tar.gz pki-d78d7442be02b6b83d9dad3fc089fa9f9d8ceb48.tar.xz pki-d78d7442be02b6b83d9dad3fc089fa9f9d8ceb48.zip | |
Renamed SERVER_NAME and PKI_MACHINE_NAME into PKI_HOSTNAME.
The SERVER_NAME and PKI_MACHINE_NAME variables have been renamed
into PKI_HOSTNAME for consistency.
Diffstat (limited to 'base/tks')
| -rw-r--r-- | base/tks/shared/conf/CS.cfg.in | 8 | ||||
| -rw-r--r-- | base/tks/shared/conf/server.xml | 12 |
2 files changed, 10 insertions, 10 deletions
diff --git a/base/tks/shared/conf/CS.cfg.in b/base/tks/shared/conf/CS.cfg.in index bb913dd60..dc3eb3751 100644 --- a/base/tks/shared/conf/CS.cfg.in +++ b/base/tks/shared/conf/CS.cfg.in @@ -21,7 +21,7 @@ admin.interface.uri=tks/admin/console/config/wizard preop.admin.name=Token Key Service Manager Administrator preop.admin.group=Token Key Service Manager Agents preop.admincert.profile=caAdminCert -preop.securitydomain.admin_url=https://[PKI_MACHINE_NAME]:9445 +preop.securitydomain.admin_url=https://[PKI_HOSTNAME]:9445 preop.wizard.name=TKS Setup Wizard preop.system.name=TKS preop.product.name=CS @@ -50,7 +50,7 @@ preop.cert.audit_signing.type=remote preop.cert.audit_signing.userfriendlyname=TKS Audit Signing Certificate preop.cert.audit_signing.cncomponent.override=true preop.cert.sslserver.defaultSigningAlgorithm=SHA256withRSA -preop.cert.sslserver.dn=CN=[PKI_MACHINE_NAME] +preop.cert.sslserver.dn=CN=[PKI_HOSTNAME] preop.cert.sslserver.keysize.custom_size=2048 preop.cert.sslserver.keysize.size=2048 preop.cert.sslserver.nickname=Server-Cert cert-[PKI_INSTANCE_ID] @@ -92,10 +92,10 @@ cs.state=0 authType=pwd instanceRoot=[PKI_INSTANCE_PATH] configurationRoot=/[PKI_SUBSYSTEM_DIR]conf/ -machineName=[PKI_MACHINE_NAME] +machineName=[PKI_HOSTNAME] instanceId=[PKI_INSTANCE_ID] preop.pin=[PKI_RANDOM_NUMBER] -service.machineName=[PKI_MACHINE_NAME] +service.machineName=[PKI_HOSTNAME] service.instanceDir=[PKI_INSTANCE_ROOT] service.securePort=[PKI_AGENT_SECURE_PORT] service.non_clientauth_securePort=[PKI_EE_SECURE_PORT] diff --git a/base/tks/shared/conf/server.xml b/base/tks/shared/conf/server.xml index a8fcaa7a5..29b1777d9 100644 --- a/base/tks/shared/conf/server.xml +++ b/base/tks/shared/conf/server.xml @@ -27,11 +27,11 @@ <!-- DO NOT REMOVE - Begin PKI Status Definitions --> <!-- -Unsecure Port = http://[PKI_MACHINE_NAME]:[PKI_UNSECURE_PORT]/[PKI_SUBSYSTEM_TYPE]/ee/[PKI_SUBSYSTEM_TYPE] -Secure Agent Port = https://[PKI_MACHINE_NAME]:[PKI_AGENT_SECURE_PORT]/[PKI_SUBSYSTEM_TYPE]/agent/[PKI_SUBSYSTEM_TYPE] -Secure EE Port = https://[PKI_MACHINE_NAME]:[PKI_EE_SECURE_PORT]/[PKI_SUBSYSTEM_TYPE]/ee/[PKI_SUBSYSTEM_TYPE] -Secure Admin Port = https://[PKI_MACHINE_NAME]:[PKI_ADMIN_SECURE_PORT]/[PKI_SUBSYSTEM_TYPE]/services -PKI Console Port = pkiconsole https://[PKI_MACHINE_NAME]:[PKI_ADMIN_SECURE_PORT]/[PKI_SUBSYSTEM_TYPE] +Unsecure Port = http://[PKI_HOSTNAME]:[PKI_UNSECURE_PORT]/[PKI_SUBSYSTEM_TYPE]/ee/[PKI_SUBSYSTEM_TYPE] +Secure Agent Port = https://[PKI_HOSTNAME]:[PKI_AGENT_SECURE_PORT]/[PKI_SUBSYSTEM_TYPE]/agent/[PKI_SUBSYSTEM_TYPE] +Secure EE Port = https://[PKI_HOSTNAME]:[PKI_EE_SECURE_PORT]/[PKI_SUBSYSTEM_TYPE]/ee/[PKI_SUBSYSTEM_TYPE] +Secure Admin Port = https://[PKI_HOSTNAME]:[PKI_ADMIN_SECURE_PORT]/[PKI_SUBSYSTEM_TYPE]/services +PKI Console Port = pkiconsole https://[PKI_HOSTNAME]:[PKI_ADMIN_SECURE_PORT]/[PKI_SUBSYSTEM_TYPE] Tomcat Port = [TOMCAT_SERVER_PORT] (for shutdown) --> <!-- DO NOT REMOVE - End PKI Status Definitions --> @@ -122,7 +122,7 @@ Tomcat Port = [TOMCAT_SERVER_PORT] (for shutdown) enableLookups="false" disableUploadTimeout="true" SSLImplementation="org.apache.tomcat.util.net.jss.JSSImplementation" enableOCSP="false" - ocspResponderURL="http://[PKI_MACHINE_NAME]:9080/ca/ocsp" + ocspResponderURL="http://[PKI_HOSTNAME]:9080/ca/ocsp" ocspResponderCertNickname="ocspSigningCert cert-pki-ca" ocspCacheSize="1000" ocspMinCacheEntryDuration="60" |