summaryrefslogtreecommitdiffstats
path: root/base/ca/setup/registry_instance
diff options
context:
space:
mode:
authorMatthew Harmsen <mharmsen@redhat.com>2012-05-23 18:59:06 -0700
committerMatthew Harmsen <mharmsen@redhat.com>2012-05-25 14:59:48 -0700
commit4a263b8db27208413acd0f038ea67629d5ee27bb (patch)
tree8c747215e522100304e9afced96d0720bd49501d /base/ca/setup/registry_instance
parent2408bec41a56378fcf942a68a1ab290464c001d7 (diff)
downloadpki-4a263b8db27208413acd0f038ea67629d5ee27bb.tar.gz
pki-4a263b8db27208413acd0f038ea67629d5ee27bb.tar.xz
pki-4a263b8db27208413acd0f038ea67629d5ee27bb.zip
PKI Deployment Scriptlets
* Integration of Tomcat 7 * Addition of centralized 'pki-tomcatd' systemd functionality to the PKI Deployment strategy * Removal of 'pki_flavor' attribute
Diffstat (limited to 'base/ca/setup/registry_instance')
-rw-r--r--base/ca/setup/registry_instance7
1 files changed, 2 insertions, 5 deletions
diff --git a/base/ca/setup/registry_instance b/base/ca/setup/registry_instance
index 3210b9131..c97b0c736 100644
--- a/base/ca/setup/registry_instance
+++ b/base/ca/setup/registry_instance
@@ -1,8 +1,5 @@
# Establish PKI Variable "Slot" Substitutions
-PKI_FLAVOR=[PKI_FLAVOR]
-export PKI_FLAVOR
-
PKI_SUBSYSTEM_TYPE=[PKI_SUBSYSTEM_TYPE]
export PKI_SUBSYSTEM_TYPE
@@ -38,13 +35,13 @@ export TOMCAT_USER
TOMCAT_GROUP=$PKI_GROUP
export TOMCAT_GROUP
-PKI_LOCKDIR="/var/lock/${PKI_FLAVOR}/${PKI_SUBSYSTEM_TYPE}"
+PKI_LOCKDIR="/var/lock/pki/${PKI_SUBSYSTEM_TYPE}"
export PKI_LOCKDIR
PKI_LOCKFILE="${PKI_LOCKDIR}/${PKI_INSTANCE_ID}"
export PKI_LOCKFILE
-PKI_PIDDIR="/var/run/${PKI_FLAVOR}/${PKI_SUBSYSTEM_TYPE}"
+PKI_PIDDIR="/var/run/pki/${PKI_SUBSYSTEM_TYPE}"
export PKI_PIDDIR
PKI_PIDFILE="${PKI_PIDDIR}/${PKI_INSTANCE_ID}.pid"