diff options
author | mharmsen <mharmsen@c9f7a03b-bd48-0410-a16d-cbbf54688b0b> | 2009-04-20 21:57:03 +0000 |
---|---|---|
committer | mharmsen <mharmsen@c9f7a03b-bd48-0410-a16d-cbbf54688b0b> | 2009-04-20 21:57:03 +0000 |
commit | c9905bdb88eeac3b3dd433754c2b513bfe456969 (patch) | |
tree | e40888a5abfbda16731e9d4aea0eda2ceb803d2a /pki/base/ocsp/shared | |
parent | e1c9a7fb5842956842b325d78b0568b3299cf5e1 (diff) | |
download | pki-c9905bdb88eeac3b3dd433754c2b513bfe456969.tar.gz pki-c9905bdb88eeac3b3dd433754c2b513bfe456969.tar.xz pki-c9905bdb88eeac3b3dd433754c2b513bfe456969.zip |
Bugzilla Bug #496679 - Use instance-specific paths rather than redirected
paths in Execution Management Scripts.
git-svn-id: svn+ssh://svn.fedorahosted.org/svn/pki/trunk@404 c9f7a03b-bd48-0410-a16d-cbbf54688b0b
Diffstat (limited to 'pki/base/ocsp/shared')
-rwxr-xr-x | pki/base/ocsp/shared/etc/init.d/httpd | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/pki/base/ocsp/shared/etc/init.d/httpd b/pki/base/ocsp/shared/etc/init.d/httpd index 27005a6fb..c0bc659f2 100755 --- a/pki/base/ocsp/shared/etc/init.d/httpd +++ b/pki/base/ocsp/shared/etc/init.d/httpd @@ -25,7 +25,7 @@ # (Tomcat 5.0) # processname: [PKI_INSTANCE_ID] # pidfile: /var/run/[PKI_INSTANCE_ID].pid -# config: /etc/[PKI_INSTANCE_ID]/tomcat5.conf +# config: [PKI_INSTANCE_PATH]/conf/tomcat5.conf # # Gomez Henri <hgomez@users.sourceforge.net> # Keith Irwin <keith_irwin@non.hp.com> @@ -139,8 +139,8 @@ else ####################################################################### ## NOTE: The following code needs to eventually be moved into the ## - ## template used to create the "/etc/<instance>/tomcat5.conf" ## - ## file! ## + ## template used to create the ## + ## "[PKI_INSTANCE_PATH]/conf/tomcat5.conf" file! ## ####################################################################### if [ ${OS} = "SunOS" ] ; then @@ -203,19 +203,19 @@ fi # Since the daemon function will sandbox $tomcat # no environment stuff should be defined here anymore. -# Please use the /etc/tomcat.conf file instead ; it will -# be read by the $tomcat script +# Please use the [PKI_INSTANCE_PATH]/conf/tomcat5.conf +# file instead ; it will be read by the $tomcat script pidfile=${PIDFILE:-/var/run/[PKI_INSTANCE_ID].pid} lockfile=${LOCKFILE:-/var/lock/subsys/[PKI_INSTANCE_ID]} -RESTART_SERVER=/var/lib/[PKI_INSTANCE_ID]/conf/restart_server_after_configuration +RESTART_SERVER=[PKI_INSTANCE_PATH]/conf/restart_server_after_configuration RETVAL=0 check_pki_configuration_status() { rv=0 - rv=`grep -c ^preop /etc/[PKI_INSTANCE_ID]/CS.cfg` + rv=`grep -c ^preop [PKI_INSTANCE_PATH]/conf/CS.cfg` rv=`expr ${rv} + 0` |