Renamed PKI_INSTANCE_ID into PKI_INSTANCE_NAME.

The PKI_INSTANCE_ID variable has been renamed into PKI_INSTANCE_NAME
for consistency.

3 files changed, 16 insertions, 16 deletions

diff --git a/base/tks/setup/registry_instance b/base/tks/setup/registry_instance
index c97b0c736..6365ecb9e 100644
--- a/base/tks/setup/registry_instance
+++ b/base/tks/setup/registry_instance
@@ -9,8 +9,8 @@ export PKI_USER
 PKI_GROUP=[PKI_GROUP]
 export PKI_GROUP
 
-PKI_INSTANCE_ID=[PKI_INSTANCE_ID]
-export PKI_INSTANCE_ID
+PKI_INSTANCE_NAME=[PKI_INSTANCE_NAME]
+export PKI_INSTANCE_NAME
 
 PKI_INSTANCE_PATH=[PKI_INSTANCE_PATH]
 export PKI_INSTANCE_PATH
@@ -26,7 +26,7 @@ export PKI_SERVER_XML_CONF
 CATALINA_BASE=$PKI_INSTANCE_PATH
 export CATALINA_BASE
 
-TOMCAT_PROG=$PKI_INSTANCE_ID
+TOMCAT_PROG=$PKI_INSTANCE_NAME
 export TOMCAT_PROG
 
 TOMCAT_USER=$PKI_USER
@@ -38,16 +38,16 @@ export TOMCAT_GROUP
 PKI_LOCKDIR="/var/lock/pki/${PKI_SUBSYSTEM_TYPE}"
 export PKI_LOCKDIR
 
-PKI_LOCKFILE="${PKI_LOCKDIR}/${PKI_INSTANCE_ID}"
+PKI_LOCKFILE="${PKI_LOCKDIR}/${PKI_INSTANCE_NAME}"
 export PKI_LOCKFILE
 
 PKI_PIDDIR="/var/run/pki/${PKI_SUBSYSTEM_TYPE}"
 export PKI_PIDDIR
 
-PKI_PIDFILE="${PKI_PIDDIR}/${PKI_INSTANCE_ID}.pid"
+PKI_PIDFILE="${PKI_PIDDIR}/${PKI_INSTANCE_NAME}.pid"
 export PKI_PIDFILE
 
-TOMCAT_LOCKFILE=/var/lock/subsys/${PKI_INSTANCE_ID}
+TOMCAT_LOCKFILE=/var/lock/subsys/${PKI_INSTANCE_NAME}
 export TOMCAT_LOCKFILE
 
 TOMCAT_PIDFILE=[TOMCAT_PIDFILE]
diff --git a/base/tks/shared/conf/CS.cfg.in b/base/tks/shared/conf/CS.cfg.in
index dc3eb3751..be9b42692 100644
--- a/base/tks/shared/conf/CS.cfg.in
+++ b/base/tks/shared/conf/CS.cfg.in
@@ -3,7 +3,7 @@ _001=## Token Key Service (TKS) 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=TKS
 admin.interface.uri=tks/admin/console/config/wizard
@@ -42,7 +42,7 @@ preop.cert.audit_signing.defaultSigningAlgorithm=SHA256withRSA
 preop.cert.audit_signing.dn=CN=TKS 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=tks
@@ -53,7 +53,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=tks
@@ -64,7 +64,7 @@ preop.cert.subsystem.defaultSigningAlgorithm=SHA256withRSA
 preop.cert.subsystem.dn=CN=TKS 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=tks
@@ -93,14 +93,14 @@ authType=pwd
 instanceRoot=[PKI_INSTANCE_PATH]
 configurationRoot=/[PKI_SUBSYSTEM_DIR]conf/
 machineName=[PKI_HOSTNAME]
-instanceId=[PKI_INSTANCE_ID]
+instanceId=[PKI_INSTANCE_NAME]
 preop.pin=[PKI_RANDOM_NUMBER]
 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]
 passwordFile=[PKI_INSTANCE_PATH]/conf/password.conf
 passwordClass=com.netscape.cmsutil.password.PlainPasswordFile
 multiroles=true
@@ -220,7 +220,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 TKS 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
@@ -268,7 +268,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/tks/shared/conf/serverCertNick.conf b/base/tks/shared/conf/serverCertNick.conf
index 2233ada52..a7a0d2899 100644
--- a/base/tks/shared/conf/serverCertNick.conf
+++ b/base/tks/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]