[Fedora-directory-commits] ldapserver/ldap/admin/src/scripts template-start-slapd.in, 1.3, 1.4 template-stop-slapd.in, 1.3, 1.4

[Richard Allen Megginson (rmeggins)]

Author: rmeggins

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

Modified Files:
	template-start-slapd.in template-stop-slapd.in 
Log Message:
Resolves: bug 224606
Bug Description: Instance specific dirs should be in instance directory
Reviewed by: nhosoi (Thanks!)
Fix Description: Fixed create instance to create these instance specific directories:
/var/lock/slapd-instance -> /var/lock/fedora-ds/slapd-instance
/var/lib/slapd-instance -> /var/lib/fedora-ds/slapd-instance
/var/log/slapd-instance -> /var/log/fedora-ds/slapd-instance
/var/run/slapd-instance -> /var/run/fedora-ds
For now, I'm side-stepping the question of what to do about permissions on /var/run/fedora-ds/slapd-instance.pid - we'll address this in the RPM creation.
I've also moved the migration scripts to the %{_libdir}/fedora-ds/slapd-instance directory, and I've made the default directory for the key/cert db the same as the config directory.  I think the dynamic nature of their configuration warrants the move.
Platforms tested: RHEL4
Flag Day: no
Doc impact: no



Index: template-start-slapd.in
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/template-start-slapd.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- template-start-slapd.in	28 Nov 2006 17:13:48 -0000	1.3
+++ template-start-slapd.in	26 Jan 2007 20:00:45 -0000	1.4
@@ -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.in
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/template-stop-slapd.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- template-stop-slapd.in	28 Nov 2006 17:13:48 -0000	1.3
+++ template-stop-slapd.in	26 Jan 2007 20:00:45 -0000	1.4
@@ -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