From ea6e70f88331defc7c37afa624c9ee047d8c3968 Mon Sep 17 00:00:00 2001 From: Rich Megginson Date: Fri, 26 Jan 2007 20:00:45 +0000 Subject: 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 --- ldap/admin/src/scripts/template-start-slapd.in | 4 ++-- ldap/admin/src/scripts/template-stop-slapd.in | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'ldap/admin/src/scripts') diff --git a/ldap/admin/src/scripts/template-start-slapd.in b/ldap/admin/src/scripts/template-start-slapd.in index 2b8774e4..4e65c8c7 100755 --- a/ldap/admin/src/scripts/template-start-slapd.in +++ b/ldap/admin/src/scripts/template-start-slapd.in @@ -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.in b/ldap/admin/src/scripts/template-stop-slapd.in index 46b2e416..0d02c9da 100755 --- a/ldap/admin/src/scripts/template-stop-slapd.in +++ b/ldap/admin/src/scripts/template-stop-slapd.in @@ -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