summaryrefslogtreecommitdiffstats
path: root/base/kra/setup
diff options
context:
space:
mode:
authorEndi Sukma Dewata <edewata@redhat.com>2013-05-21 14:23:20 -0400
committerEndi Sukma Dewata <edewata@redhat.com>2013-05-30 12:00:44 -0400
commit90d3f20d2066ac471d5368d7a8394b16548f72de (patch)
tree9787a1435effa56b47c57de93410f543ee0223de /base/kra/setup
parentd78d7442be02b6b83d9dad3fc089fa9f9d8ceb48 (diff)
downloadpki-90d3f20d2066ac471d5368d7a8394b16548f72de.tar.gz
pki-90d3f20d2066ac471d5368d7a8394b16548f72de.tar.xz
pki-90d3f20d2066ac471d5368d7a8394b16548f72de.zip
Renamed PKI_INSTANCE_ID into PKI_INSTANCE_NAME.
The PKI_INSTANCE_ID variable has been renamed into PKI_INSTANCE_NAME for consistency.
Diffstat (limited to 'base/kra/setup')
-rw-r--r--base/kra/setup/registry_instance12
1 files changed, 6 insertions, 6 deletions
diff --git a/base/kra/setup/registry_instance b/base/kra/setup/registry_instance
index c97b0c736..6365ecb9e 100644
--- a/base/kra/setup/registry_instance
+++ b/base/kra/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]