1 files changed, 2 insertions, 73 deletions
diff --git a/ldap/admin/src/scripts/template-start-slapd.in b/ldap/admin/src/scripts/template-start-slapd.in
index 223d6ed1..7608d373 100755
--- a/ldap/admin/src/scripts/template-start-slapd.in
+++ b/ldap/admin/src/scripts/template-start-slapd.in
@@ -1,81 +1,10 @@
 #!/bin/sh
 
-prefix="{{DS-ROOT}}"
-LD_LIBRARY_PATH=$prefix{{SERVER-DIR}}:$prefix@nss_libdir@:$prefix@libdir@:@nss_libdir@
-export LD_LIBRARY_PATH
-SHLIB_PATH=$prefix{{SERVER-DIR}}:$prefix@nss_libdir@:$prefix@libdir@:@nss_libdir@
-export SHLIB_PATH
-
-# source env. for all instances
-[ -f @initconfigdir@/@package_name@ ] && . @initconfigdir@/@package_name@
-
-# source env. for this instance
-[ -f @initconfigdir@/@package_name@-{{SERV-ID}} ] && . @initconfigdir@/@package_name@-{{SERV-ID}}
-
 # Script that starts the ns-slapd server.
 # Exit status can be:
 #       0: Server started successfully
 #       1: Server could not be started
 #       2: Server already running
 
-DS_CONFIG_DIR={{CONFIG-DIR}}
-export DS_CONFIG_DIR
-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
-        echo There is an ns-slapd process already running: $PID
-        exit 2;
-    else
-        rm -f $STARTPIDFILE
-    fi
-fi
-if test -f $PIDFILE ; then
-    PID=`cat $PIDFILE`
-    if kill -0 $PID > /dev/null 2>&1 ; then
-        echo There is an ns-slapd running: $PID
-        exit 2;
-    else
-        rm -f $PIDFILE
-    fi
-fi
-cd {{SERVERBIN-DIR}}; ./ns-slapd -D {{CONFIG-DIR}} -i $PIDFILE -w $STARTPIDFILE "$@"
-if [ $? -ne 0 ]; then
-    exit 1
-fi
-
-loop_counter=1
-# wait for 10 seconds for the start pid file to appear
-max_count=${STARTPID_TIME:-10}
-while test $loop_counter -le $max_count; do
-    loop_counter=`expr $loop_counter + 1`
-    if test ! -f $STARTPIDFILE ; then
-        sleep 1;
-    else
-        PID=`cat $STARTPIDFILE`
-    fi
-done
-if test ! -f $STARTPIDFILE ; then
-    echo Server failed to start !!! Please check errors log for problems
-    exit 1
-fi
-loop_counter=1
-# wait for 10 minutes (600 times 1 seconds)
-max_count=${PID_TIME:-600}
-while test $loop_counter -le $max_count; do
-    loop_counter=`expr $loop_counter + 1`
-    if test ! -f $PIDFILE ; then
-        if kill -0 $PID > /dev/null 2>&1 ; then
-            sleep 1
-    else
-        echo Server failed to start !!! Please check errors log for problems
-        exit 1
-    fi
-    else
-        PID=`cat $PIDFILE`
-        exit 0;
-    fi
-done
-echo Server not running!! Failed to start ns-slapd process.  Please check the errors log for problems.
-exit 1
+@sbindir@/start-dirsrv {{SERV-ID}} "$@"
+exit $?