From 12dd2b111c0188fd1e2aebb5fbca11ba11ab76ef Mon Sep 17 00:00:00 2001
From: Noriko Hosoi <nhosoi@redhat.com>
Date: Mon, 5 Feb 2007 22:30:12 +0000
Subject: Resolves: 223861 Summary: Nightly build uses autotools/yum (Comment
 #32) Changes: Makefile: moved scripts temlate dir from /etc to /usr/share
 template-{start,stop}-slapd: modified the pid and startpid name to
 slapd-<id>.pid and slapd-<id>.startpid. Note: these changes do not affect the
 new build using autotools.  The 3 files would be eliminated when we move to
 the new build completely.  The fix is for keeping the nightly acceptance
 tests healthy by the transfer is completed.

---
 ldap/admin/src/scripts/template-start-slapd | 4 ++--
 ldap/admin/src/scripts/template-stop-slapd  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'ldap/admin/src/scripts')

diff --git a/ldap/admin/src/scripts/template-start-slapd b/ldap/admin/src/scripts/template-start-slapd
index 33bcbb30..29fccba2 100644
--- a/ldap/admin/src/scripts/template-start-slapd
+++ b/ldap/admin/src/scripts/template-start-slapd
@@ -16,8 +16,8 @@ NETSITE_ROOT={{SERVER-DIR}}
 export NETSITE_ROOT
 DS_CONFIG_DIR={{CONFIG-DIR}}
 export DS_CONFIG_DIR
-PIDFILE={{RUN-DIR}}/pid
-STARTPIDFILE={{RUN-DIR}}/startpid
+PIDFILE={{RUN-DIR}}/{{PRODUCT-NAME}}-{{SERV-ID}}.pid
+STARTPIDFILE={{RUN-DIR}}/{{PRODUCT-NAME}}-{{SERV-ID}}.startpid
 if test -f $STARTPIDFILE ; then
     PID=`cat $STARTPIDFILE`
     if kill -0 $PID > /dev/null 2>&1 ; then
diff --git a/ldap/admin/src/scripts/template-stop-slapd b/ldap/admin/src/scripts/template-stop-slapd
index db51382c..9d64151e 100644
--- a/ldap/admin/src/scripts/template-stop-slapd
+++ b/ldap/admin/src/scripts/template-stop-slapd
@@ -12,7 +12,7 @@ export SHLIB_PATH
 #       1: Server could not be stopped
 #       2: Server was not running
 
-PIDFILE={{RUN-DIR}}/pid
+PIDFILE={{RUN-DIR}}/{{PRODUCT-NAME}}-{{SERV-ID}}.pid
 if test ! -f $PIDFILE ; then
     echo No ns-slapd PID file found. Server is probably not running
     exit 2
-- 
cgit