From 4621eaf7f389989076d70244217530f1aa8bae5c Mon Sep 17 00:00:00 2001
From: mharmsen <mharmsen@c9f7a03b-bd48-0410-a16d-cbbf54688b0b>
Date: Thu, 3 Feb 2011 18:42:02 +0000
Subject: Bugzilla Bug #674917 - Restore identification of Tomcat-based PKI
 subsystem instances

git-svn-id: svn+ssh://svn.fedorahosted.org/svn/pki/trunk@1816 c9f7a03b-bd48-0410-a16d-cbbf54688b0b
---
 pki/base/tks/setup/registry_instance | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

(limited to 'pki/base/tks')

diff --git a/pki/base/tks/setup/registry_instance b/pki/base/tks/setup/registry_instance
index 7f0e592a1..3210b9131 100644
--- a/pki/base/tks/setup/registry_instance
+++ b/pki/base/tks/setup/registry_instance
@@ -41,9 +41,18 @@ export TOMCAT_GROUP
 PKI_LOCKDIR="/var/lock/${PKI_FLAVOR}/${PKI_SUBSYSTEM_TYPE}"
 export PKI_LOCKDIR
 
-PKI_LOCKFILE="${PKI_LOCKDIR}/${PKI_INSTANCE_ID}.pid"
+PKI_LOCKFILE="${PKI_LOCKDIR}/${PKI_INSTANCE_ID}"
 export PKI_LOCKFILE
 
+PKI_PIDDIR="/var/run/${PKI_FLAVOR}/${PKI_SUBSYSTEM_TYPE}"
+export PKI_PIDDIR
+
+PKI_PIDFILE="${PKI_PIDDIR}/${PKI_INSTANCE_ID}.pid"
+export PKI_PIDFILE
+
+TOMCAT_LOCKFILE=/var/lock/subsys/${PKI_INSTANCE_ID}
+export TOMCAT_LOCKFILE
+
 TOMCAT_PIDFILE=[TOMCAT_PIDFILE]
 export TOMCAT_PIDFILE
 
-- 
cgit