From d78d7442be02b6b83d9dad3fc089fa9f9d8ceb48 Mon Sep 17 00:00:00 2001
From: Endi Sukma Dewata <edewata@redhat.com>
Date: Mon, 20 May 2013 22:59:15 -0400
Subject: 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.
---
 base/ocsp/shared/conf/CS.cfg.in  |  8 ++++----
 base/ocsp/shared/conf/server.xml | 12 ++++++------
 2 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'base/ocsp')

diff --git a/base/ocsp/shared/conf/CS.cfg.in b/base/ocsp/shared/conf/CS.cfg.in
index 09ce2bdc4..29fb8e7e6 100644
--- a/base/ocsp/shared/conf/CS.cfg.in
+++ b/base/ocsp/shared/conf/CS.cfg.in
@@ -22,7 +22,7 @@ agent.interface.uri=ocsp/agent/ocsp
 preop.admin.name=Online Certificate Status Manager Administrator
 preop.admin.group=Online Certificate Status 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=OCSP Setup Wizard
 preop.product.name=CS
 cms.product.version=@APPLICATION_VERSION@
@@ -75,7 +75,7 @@ preop.cert.signing.type=remote
 preop.cert.signing.userfriendlyname=OCSP Signing Certificate
 preop.cert.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]
@@ -100,9 +100,9 @@ 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]
-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/ocsp/shared/conf/server.xml b/base/ocsp/shared/conf/server.xml
index a8fcaa7a5..29b1777d9 100644
--- a/base/ocsp/shared/conf/server.xml
+++ b/base/ocsp/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"
-- 
cgit