From 1731ff56f6337e28d5575954433d472804d46f45 Mon Sep 17 00:00:00 2001
From: Alexander Sulfrian <alex@spline.inf.fu-berlin.de>
Date: Wed, 28 Oct 2015 19:28:33 +0100
Subject: contrib: Move init script into contrib

---
 Makefile            |  8 ++---
 contrib/server.init | 89 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 server.init         | 87 ---------------------------------------------------
 3 files changed, 93 insertions(+), 91 deletions(-)
 create mode 100644 contrib/server.init
 delete mode 100644 server.init

diff --git a/Makefile b/Makefile
index be2a472..a82841e 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@ INITDIR=$(PREFIX)/etc/rc.d
 
 install:
 	install -d $(BINDIR) $(INITDIR)
-	install --mode=755 server.pl   $(BINDIR)/server
-	install --mode=755 log.pl      $(BINDIR)/log
-	install --mode=755 stats.pl    $(BINDIR)/stats
-	install --mode=755 server.init $(INITDIR)/server
+	install --mode=755 server.pl           $(BINDIR)/server
+	install --mode=755 log.pl              $(BINDIR)/log
+	install --mode=755 stats.pl            $(BINDIR)/stats
+	install --mode=755 contrib/server.init $(INITDIR)/server
diff --git a/contrib/server.init b/contrib/server.init
new file mode 100644
index 0000000..b331c24
--- /dev/null
+++ b/contrib/server.init
@@ -0,0 +1,89 @@
+#! /bin/sh
+DESC="SpamAssassin Statistics Server"
+NAME="spamd-stats-server"
+ 
+EXEC="/usr/bin/perl"
+DAEMON="$HOME/bin/server"
+DAEMON_ARGS=""
+PIDFILE="$HOME/var/$NAME.pid"
+ 
+. /lib/lsb/init-functions
+ 
+do_start() {
+  /sbin/start-stop-daemon --start --quiet --pidfile "$PIDFILE" \
+    --exec "$EXEC" --startas "$DAEMON" --test > /dev/null || return 1
+ 
+  /sbin/start-stop-daemon --start --quiet --pidfile "$PIDFILE" \
+    --exec "$EXEC" --startas "$DAEMON" --background \
+    --make-pidfile -- $DAEMON_ARGS || return 2
+}
+ 
+killtree() {
+  local _pid=$1
+  local _sig=${2-TERM}
+  for _child in $(ps -o pid --no-headers --ppid ${_pid}); do
+    killtree ${_child} ${_sig}
+  done
+  kill -${_sig} ${_pid}
+}
+ 
+do_stop() {
+  /sbin/start-stop-daemon --stop --quiet --test --pidfile "$PIDFILE" \
+    --exec "$EXEC" --startas "$DAEMON" && killtree "$(cat "$PIDFILE")"
+ 
+  RETVAL="$?"
+  [ "$RETVAL" = 2 ] && return 2
+ 
+  rm -f $PIDFILE
+  return "$RETVAL"
+}
+ 
+case "$1" in
+  start)
+    log_daemon_msg "Starting $DESC" "$NAME"
+    do_start
+    case "$?" in
+      0|1) log_end_msg 0 ;;
+      2) log_end_msg 1 ;;
+    esac
+    ;;
+ 
+  stop)
+    log_daemon_msg "Stopping $DESC" "$NAME"
+    do_stop
+    case "$?" in
+       0|1) log_end_msg 0 ;;
+       2) log_end_msg 1 ;;
+    esac
+    ;;
+ 
+  restart)
+    log_daemon_msg "Restarting $DESC" "$NAME"
+    do_stop
+    case "$?" in
+      0|1)
+        do_start
+        case "$?" in
+          0) log_end_msg 0 ;;
+          1) log_end_msg 1 ;; # Old process is still running
+          *) log_end_msg 1 ;; # Failed to start
+        esac
+        ;;
+      *)
+      # Failed to stop
+      log_end_msg 1
+      ;;
+    esac
+    ;;
+ 
+  status)
+    status_of_proc -p "$PIDFILE" "$DAEMON" "$NAME" && exit 0 || exit $?
+    ;;
+ 
+  *)
+    echo "Usage: $0 (start|stop|restart|status)" >&2
+    exit 3
+    ;;
+esac
+ 
+:
diff --git a/server.init b/server.init
deleted file mode 100644
index d4d5d37..0000000
--- a/server.init
+++ /dev/null
@@ -1,87 +0,0 @@
-#! /bin/sh
-DESC="SpamAssassin Statistics Server"
-NAME="spamd-stats-server"
- 
-DAEMON="$HOME/bin/server"
-DAEMON_ARGS=""
-PIDFILE="$HOME/var/$NAME.pid"
- 
-. /lib/lsb/init-functions
- 
-do_start() {
-  /sbin/start-stop-daemon --start --quiet --pidfile "$PIDFILE" \
-    --exec "$DAEMON" --test > /dev/null || return 1
- 
-  /sbin/start-stop-daemon --start --quiet --pidfile "$PIDFILE" \
-    --exec "$DAEMON" --background --make-pidfile -- $DAEMON_ARGS || return 2
-}
- 
-killtree() {
-  local _pid=$1
-  local _sig=${2-TERM}
-  for _child in $(ps -o pid --no-headers --ppid ${_pid}); do
-    killtree ${_child} ${_sig}
-  done
-  kill -${_sig} ${_pid}
-}
- 
-do_stop() {
-  /sbin/start-stop-daemon --stop --quiet --test --pidfile "$PIDFILE" \
-    --exec "$DAEMON" && killtree "$(cat "$PIDFILE")"
- 
-  RETVAL="$?"
-  [ "$RETVAL" = 2 ] && return 2
- 
-  rm -f $PIDFILE
-  return "$RETVAL"
-}
- 
-case "$1" in
-  start)
-    log_daemon_msg "Starting $DESC" "$NAME"
-    do_start
-    case "$?" in
-      0|1) log_end_msg 0 ;;
-      2) log_end_msg 1 ;;
-    esac
-    ;;
- 
-  stop)
-    log_daemon_msg "Stopping $DESC" "$NAME"
-    do_stop
-    case "$?" in
-       0|1) log_end_msg 0 ;;
-       2) log_end_msg 1 ;;
-    esac
-    ;;
- 
-  restart)
-    log_daemon_msg "Restarting $DESC" "$NAME"
-    do_stop
-    case "$?" in
-      0|1)
-        do_start
-        case "$?" in
-          0) log_end_msg 0 ;;
-          1) log_end_msg 1 ;; # Old process is still running
-          *) log_end_msg 1 ;; # Failed to start
-        esac
-        ;;
-      *)
-      # Failed to stop
-      log_end_msg 1
-      ;;
-    esac
-    ;;
- 
-  status)
-    status_of_proc -p "$PIDFILE" "$DAEMON" "$NAME" && exit 0 || exit $?
-    ;;
- 
-  *)
-    echo "Usage: $0 (start|stop|restart|status)" >&2
-    exit 3
-    ;;
-esac
- 
-:
-- 
cgit v1.2.3-1-g7c22