diff options
| author | Alexander Sulfrian <alex@spline.inf.fu-berlin.de> | 2015-10-28 19:28:33 +0100 |
|---|---|---|
| committer | spamd-stats <spamd-stats@vm-mail.spline.inf.fu-berlin.de> | 2015-10-28 19:28:33 +0100 |
| commit | 1731ff56f6337e28d5575954433d472804d46f45 (patch) | |
| tree | b0094d4eb8144db0039e631099fd60fbec51b390 | |
| parent | ca3f250055b35cd3f939b00ec7259862b2d19385 (diff) | |
| download | spamd-stats-1731ff56f6337e28d5575954433d472804d46f45.tar.gz spamd-stats-1731ff56f6337e28d5575954433d472804d46f45.tar.bz2 spamd-stats-1731ff56f6337e28d5575954433d472804d46f45.zip | |
contrib: Move init script into contrib
| -rw-r--r-- | Makefile | 8 | ||||
| -rw-r--r-- | contrib/server.init (renamed from server.init) | 8 |
2 files changed, 9 insertions, 7 deletions
@@ -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/server.init b/contrib/server.init index d4d5d37..b331c24 100644 --- a/server.init +++ b/contrib/server.init @@ -2,6 +2,7 @@ DESC="SpamAssassin Statistics Server" NAME="spamd-stats-server" +EXEC="/usr/bin/perl" DAEMON="$HOME/bin/server" DAEMON_ARGS="" PIDFILE="$HOME/var/$NAME.pid" @@ -10,10 +11,11 @@ PIDFILE="$HOME/var/$NAME.pid" do_start() { /sbin/start-stop-daemon --start --quiet --pidfile "$PIDFILE" \ - --exec "$DAEMON" --test > /dev/null || return 1 + --exec "$EXEC" --startas "$DAEMON" --test > /dev/null || return 1 /sbin/start-stop-daemon --start --quiet --pidfile "$PIDFILE" \ - --exec "$DAEMON" --background --make-pidfile -- $DAEMON_ARGS || return 2 + --exec "$EXEC" --startas "$DAEMON" --background \ + --make-pidfile -- $DAEMON_ARGS || return 2 } killtree() { @@ -27,7 +29,7 @@ killtree() { do_stop() { /sbin/start-stop-daemon --stop --quiet --test --pidfile "$PIDFILE" \ - --exec "$DAEMON" && killtree "$(cat "$PIDFILE")" + --exec "$EXEC" --startas "$DAEMON" && killtree "$(cat "$PIDFILE")" RETVAL="$?" [ "$RETVAL" = 2 ] && return 2 |