Renamed PKI_INSTANCE_ID into PKI_INSTANCE_NAME.

The PKI_INSTANCE_ID variable has been renamed into PKI_INSTANCE_NAME
for consistency.

2 files changed, 11 insertions, 11 deletions

diff --git a/base/ocsp/shared/conf/CS.cfg.in b/base/ocsp/shared/conf/CS.cfg.in
index 29fb8e7e6..06aead349 100644
--- a/base/ocsp/shared/conf/CS.cfg.in
+++ b/base/ocsp/shared/conf/CS.cfg.in
@@ -3,7 +3,7 @@ _001=## Online Certificate Status Protocol (OCSP) Responder Configuration File
 _002=##
 pidDir=[PKI_PIDDIR]
 pkicreate.pki_instance_root=[PKI_INSTANCE_ROOT]
-pkicreate.pki_instance_name=[PKI_INSTANCE_ID]
+pkicreate.pki_instance_name=[PKI_INSTANCE_NAME]
 pkicreate.subsystem_type=[PKI_SUBSYSTEM_TYPE]
 pkicreate.agent_secure_port=[PKI_AGENT_SECURE_PORT]
 pkicreate.ee_secure_port=[PKI_EE_SECURE_PORT]
@@ -14,7 +14,7 @@ pkicreate.tomcat_server_port=[TOMCAT_SERVER_PORT]
 pkicreate.user=[PKI_USER]
 pkicreate.group=[PKI_GROUP]
 pkicreate.systemd.servicename=[PKI_SYSTEMD_SERVICENAME]
-pkiremove.cert.subsystem.nickname=subsystemCert cert-[PKI_INSTANCE_ID]
+pkiremove.cert.subsystem.nickname=subsystemCert cert-[PKI_INSTANCE_NAME]
 installDate=[INSTALL_TIME]
 cs.type=OCSP
 admin.interface.uri=ocsp/admin/console/config/wizard
@@ -56,7 +56,7 @@ preop.cert.audit_signing.defaultSigningAlgorithm=SHA256withRSA
 preop.cert.audit_signing.dn=CN=OCSP Audit Signing Certificate
 preop.cert.audit_signing.keysize.custom_size=2048
 preop.cert.audit_signing.keysize.size=2048
-preop.cert.audit_signing.nickname=auditSigningCert cert-[PKI_INSTANCE_ID]
+preop.cert.audit_signing.nickname=auditSigningCert cert-[PKI_INSTANCE_NAME]
 preop.cert.audit_signing.profile=caInternalAuthAuditSigningCert
 preop.cert.audit_signing.signing.required=false
 preop.cert.audit_signing.subsystem=ocsp
@@ -67,7 +67,7 @@ preop.cert.signing.defaultSigningAlgorithm=SHA256withRSA
 preop.cert.signing.dn=CN=OCSP Signing Certificate
 preop.cert.signing.keysize.custom_size=2048
 preop.cert.signing.keysize.size=2048
-preop.cert.signing.nickname=ocspSigningCert cert-[PKI_INSTANCE_ID]
+preop.cert.signing.nickname=ocspSigningCert cert-[PKI_INSTANCE_NAME]
 preop.cert.signing.profile=caInternalAuthOCSPCert
 preop.cert.signing.signing.required=true
 preop.cert.signing.subsystem=ocsp
@@ -78,7 +78,7 @@ preop.cert.sslserver.defaultSigningAlgorithm=SHA256withRSA
 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]
+preop.cert.sslserver.nickname=Server-Cert cert-[PKI_INSTANCE_NAME]
 preop.cert.sslserver.profile=caInternalAuthServerCert
 preop.cert.sslserver.signing.required=false
 preop.cert.sslserver.subsystem=ocsp
@@ -89,7 +89,7 @@ preop.cert.subsystem.defaultSigningAlgorithm=SHA256withRSA
 preop.cert.subsystem.dn=CN=OCSP Subsystem Certificate
 preop.cert.subsystem.keysize.custom_size=2048
 preop.cert.subsystem.keysize.size=2048
-preop.cert.subsystem.nickname=subsystemCert cert-[PKI_INSTANCE_ID]
+preop.cert.subsystem.nickname=subsystemCert cert-[PKI_INSTANCE_NAME]
 preop.cert.subsystem.profile=caInternalAuthSubsystemCert
 preop.cert.subsystem.signing.required=false
 preop.cert.subsystem.subsystem=ocsp
@@ -101,13 +101,13 @@ authType=pwd
 instanceRoot=[PKI_INSTANCE_PATH]
 configurationRoot=/[PKI_SUBSYSTEM_DIR]conf/
 machineName=[PKI_HOSTNAME]
-instanceId=[PKI_INSTANCE_ID]
+instanceId=[PKI_INSTANCE_NAME]
 service.machineName=[PKI_HOSTNAME]
 service.instanceDir=[PKI_INSTANCE_ROOT]
 service.securePort=[PKI_AGENT_SECURE_PORT]
 service.non_clientauth_securePort=[PKI_EE_SECURE_PORT]
 service.unsecurePort=[PKI_UNSECURE_PORT]
-service.instanceID=[PKI_INSTANCE_ID]
+service.instanceID=[PKI_INSTANCE_NAME]
 preop.pin=[PKI_RANDOM_NUMBER]
 passwordFile=[PKI_INSTANCE_PATH]/conf/password.conf
 passwordClass=com.netscape.cmsutil.password.PlainPasswordFile
@@ -227,7 +227,7 @@ log.instance.SignedAudit.rolloverInterval=2592000
 log.instance.SignedAudit.signedAudit:_000=##
 log.instance.SignedAudit.signedAudit:_001=## Fill in the nickname of a trusted signing certificate to allow OCSP audit logs to be signed
 log.instance.SignedAudit.signedAudit:_002=##
-log.instance.SignedAudit.signedAuditCertNickname=auditSigningCert cert-[PKI_INSTANCE_ID]
+log.instance.SignedAudit.signedAuditCertNickname=auditSigningCert cert-[PKI_INSTANCE_NAME]
 log.instance.SignedAudit.type=signedAudit
 log.instance.System._000=##
 log.instance.System._001=## System Logging
@@ -284,7 +284,7 @@ oidmap.pse.class=netscape.security.extensions.PresenceServerExtension
 oidmap.pse.oid=2.16.840.1.113730.1.18
 oidmap.subject_info_access.class=netscape.security.extensions.SubjectInfoAccessExtension
 oidmap.subject_info_access.oid=1.3.6.1.5.5.7.1.11
-os.serverName=cert-[PKI_INSTANCE_ID]
+os.serverName=cert-[PKI_INSTANCE_NAME]
 os.userid=nobody
 registry.file=[PKI_INSTANCE_PATH]/conf/registry.cfg
 selftests._000=##
diff --git a/base/ocsp/shared/conf/serverCertNick.conf b/base/ocsp/shared/conf/serverCertNick.conf
index 2233ada52..a7a0d2899 100644
--- a/base/ocsp/shared/conf/serverCertNick.conf
+++ b/base/ocsp/shared/conf/serverCertNick.conf
@@ -3,4 +3,4 @@
 # All rights reserved.
 # --- END COPYRIGHT BLOCK ---
 #
-Server-Cert cert-[PKI_INSTANCE_ID]
+Server-Cert cert-[PKI_INSTANCE_NAME]