diff options
| author | Noriko Hosoi <nhosoi@redhat.com> | 2007-02-05 22:30:12 +0000 |
|---|---|---|
| committer | Noriko Hosoi <nhosoi@redhat.com> | 2007-02-05 22:30:12 +0000 |
| commit | 12dd2b111c0188fd1e2aebb5fbca11ba11ab76ef (patch) | |
| tree | ba8da1b79c359a9579295e7142d346f0cb0fefd5 /ldap/admin/src | |
| parent | 71e894627fe94d939681c3ebe413d4238e87c01b (diff) | |
| download | ds-12dd2b111c0188fd1e2aebb5fbca11ba11ab76ef.tar.gz ds-12dd2b111c0188fd1e2aebb5fbca11ba11ab76ef.tar.xz ds-12dd2b111c0188fd1e2aebb5fbca11ba11ab76ef.zip | |
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.
Diffstat (limited to 'ldap/admin/src')
| -rw-r--r-- | ldap/admin/src/Makefile | 2 | ||||
| -rw-r--r-- | ldap/admin/src/scripts/template-start-slapd | 4 | ||||
| -rw-r--r-- | ldap/admin/src/scripts/template-stop-slapd | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/ldap/admin/src/Makefile b/ldap/admin/src/Makefile index 16392280..f57a00d2 100644 --- a/ldap/admin/src/Makefile +++ b/ldap/admin/src/Makefile @@ -51,7 +51,7 @@ OBJDEST=$(LDAP_ADMOBJDIR) include $(BUILD_ROOT)/nsconfig.mk include $(LDAP_SRC)/nsldap.mk -SCRIPTSDIR=$(RELDIR)/$(DS_ETCDIR)/script-templates +SCRIPTSDIR=$(RELDIR)/$(DS_DATADIR)/script-templates ifeq ($(USE_ADMINSERVER), 1) MCC_INCLUDE += $(ADMINUTIL_INCLUDE) 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 |