1 files changed, 66 insertions, 55 deletions
diff --git a/community/polipo/polipo.rc.d b/community/polipo/polipo.rc.d
index f9bbd4783..260fab050 100644
--- a/community/polipo/polipo.rc.d
+++ b/community/polipo/polipo.rc.d
@@ -1,60 +1,71 @@
 #!/bin/bash
+
+daemon_name=polipo
+
 . /etc/rc.conf
 . /etc/rc.d/functions
+. /etc/conf.d/$daemon_name.conf
+
+get_pid() {
+	pidof -o %PPID $daemon_name
+}
+
+case "$1" in
+	start)
+		stat_busy "Starting $daemon_name daemon"
+
+		PID=$(get_pid)
+		if [[ -z $PID ]]; then
+			[[ -f /run/$daemon_name.pid ]] &&
+				rm -f /run/$daemon_name.pid
+		# RUN
+		sudo -u nobody /usr/bin/$daemon_name ${POLIPO_ARGS}
+		#
+		if [[ $? -gt 0 ]]; then
+			stat_fail
+			exit 1
+		else
+			echo $(get_pid) > /run/$daemon_name.pid
+			add_daemon $daemon_name
+			stat_done
+		fi
+		else
+			stat_fail
+			exit 1
+		fi
+		;;
 
-DAEMON=polipo
-ARGS="daemonise=true pidFile=/var/run/$DAEMON/$DAEMON.pid"
-PID=$(pidof -o %PPID /usr/bin/$DAEMON)
-
-case $1 in
-    start)
-        stat_busy "Starting $DAEMON"
-        if ck_daemon $DAEMON; then
-            [[ ! -d /var/run/$DAEMON ]] && install -d $DAEMON /var/run/$DAEMON
-            /usr/bin/$DAEMON $ARGS >/dev/null 2>&1
-            if [[ $? != 0 ]]; then
-                stat_fail
-            else
-                add_daemon polipo
-                stat_done
-            fi
-        else
-            stat_fail
-        fi
-    ;;
-    stop)
-        stat_busy "Stopping $DAEMON"
-        if ! ck_daemon $DAEMON; then
-            kill $PID >/dev/null 2>&1
-            if [[ $? != 0 ]]; then
-                stat_fail
-            else
-                rm_daemon $DAEMON
-                stat_done
-            fi
-        else
-            stat_fail
-        fi
-    ;;
-    purge)
-        stat_busy "Purging $DAEMON"
-        [[ ! -d /var/run/$DAEMON ]] && install -d $DAEMON /var/run/$DAEMON
-        if ! ck_daemon $DAEMON; then
-            kill -USR1 $PID >/dev/null 2>&1
-            sleep 1
-            /usr/bin/$DAEMON -x $ARGS >/dev/null 2>&1 || stat_fail
-            kill -USR2 $PID >/dev/null 2>&1
-            stat_done
-        else
-            /usr/bin/$DAEMON -x $ARGS >/dev/null 2>&1 || stat_fail
-            stat_done
-        fi
-    ;;
-    restart)
-        $0 stop
-        $0 start
-    ;;
-    *)
-        echo "usage: $0 {start|stop|restart|purge}"
-    ;;
+	stop)
+		stat_busy "Stopping $daemon_name daemon"
+		PID=$(get_pid)
+		# KILL
+		[[ -n $PID ]] && kill $PID &> /dev/null
+		#
+		if [[ $? -gt 0 ]]; then
+			stat_fail
+			exit 1
+		else
+			rm -f /run/$daemon_name.pid &> /dev/null
+			rm_daemon $daemon_name
+			stat_done
+		fi
+		;;
+
+	restart)
+		$0 stop
+		sleep 3
+		$0 start
+		;;
+
+	status)
+		stat_busy "Checking $daemon_name status";
+		ck_status $daemon_name
+		;;
+
+	*)
+		echo "usage: $0 {start|stop|restart|status}"
 esac
+
+exit 0
+
+# vim:set ts=2 sw=2 et: