X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=example%2Fpostlicyd.initd.sh;h=d1e65108aa422aded56b9b842ed1b3e1ce1cec42;hb=6b977cdc115af3cebdf488f27d106788e8bd9461;hp=e32764b278d1aacaedfe680a9d681bbf7765ac00;hpb=c6b7ad83562006eeb29fb64be21d56bda64ca93c;p=apps%2Fpfixtools.git

diff --git a/example/postlicyd.initd.sh b/example/postlicyd.initd.sh
index e32764b..d1e6510 100755
--- a/example/postlicyd.initd.sh
+++ b/example/postlicyd.initd.sh
@@ -9,32 +9,45 @@ POSTLICYD=/usr/sbin/postlicyd
 PIDFILE=/var/run/postlicyd/pid
 CONF=/etc/pfixtools/postlicyd.conf
 
-[ -z $1 ] && die "usage $0 (start|stop|reload)"
+[ -z $1 ] && die "usage $0 (start|stop|reload|check-conf)"
+
+mkdir -p `dirname "$PIDFILE"` || die "Can't create $PIDFILE"
+
+do_checkconf() {
+  $POSTLICYD -c "$CONF"
+  return "$?"
+}
 
 case "$1" in
   start)
-    mkdir -p `dirname "$PIDFILE"` || die "Can't create $PIDFILE"
     echo "Starting postlicyd..."
-    flock -x -n "$PIDFILE" -c "true" || die "Already started"
-    $POSTLICYD -p "$PIDFILE" "$CONF" || die "Failed"
+    start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $POSTLICYD --text > /dev/null || die "Already running"
+    do_checkconf || die "Invalid configuration"
+    start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $POSTLICYD -- -p "$PIDFILE" "$CONF" || die "Failed"
     echo "Started"
     ;;
 
   stop)
     echo "Stopping postlicyd..."
-    ( flock -x -n "$PIDFILE" -c "true" && die "Not started" ) \
-      || ( kill `cat $PIDFILE` && echo "Stopped" ) \
-      || die "Failed"
+    start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile $PIDFILE --name "postlicyd"
+    case "$?" in
+      0) echo "Stopped" ;;
+      1) die "Nothing to stop" ;;
+      2) die "Cannot stop process" ;;
+    esac
     ;;
 
   reload)
     echo "Reloading postlicyd..."
-    ( flock -x -n "$PIDFILE" -c "true" && die "Not started" ) \
-      || ( kill -HUP `cat $PIDFILE` && ( sleep 3; echo "Done" ) ) \
-      || die "Failed"
+    do_checkconf || die "Invalid configuration"
+    start-stop-daemon --stop --signal 1 --quiet --pidfile $PIDFILE --name postlicyd
+    ;;
+
+  check-conf)
+    do_checkconf || die "Invalid configuration"
     ;;
 
   *)
-    die "usage $0 (start|stop|reload)"
+    die "usage $0 (start|stop|reload|check-conf)"
     ;;
 esac