[Fedora-directory-commits] ldapserver/ldap/admin/src/scripts template-start-slapd, 1.1, 1.2 template-stop-slapd, 1.1, 1.2

[Noriko Hosoi (nhosoi)]

Author: nhosoi

Update of /cvs/dirsec/ldapserver/ldap/admin/src/scripts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29722/src/scripts

Modified Files:
	template-start-slapd template-stop-slapd 
Log Message:
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.



Index: template-start-slapd
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/template-start-slapd,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- template-start-slapd	27 Oct 2006 16:45:18 -0000	1.1
+++ template-start-slapd	5 Feb 2007 22:30:12 -0000	1.2
@@ -16,8 +16,8 @@
 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


Index: template-stop-slapd
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/template-stop-slapd,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- template-stop-slapd	27 Oct 2006 16:45:18 -0000	1.1
+++ template-stop-slapd	5 Feb 2007 22:30:12 -0000	1.2
@@ -12,7 +12,7 @@
 #       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