From: Mikhail Gusarov Date: Fri, 28 Mar 2014 14:01:33 +0000 (+0100) Subject: Update Debianization from 0.6 branch X-Git-Tag: 0.7.0~346^2~6 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9f154d9db35d4df58ec8d6effd0bde310a5d2614;p=thirdparty%2Frspamd.git Update Debianization from 0.6 branch --- diff --git a/debian/changelog b/debian/changelog index d2d65ea96b..9bbd05120b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,5 @@ -rspamd (0.6.8) UNRELEASED; urgency=low +rspamd (0.6.9) unstable; urgency=low * Initial release (Closes: #683746) - -- Mikhail Gusarov Mon, 17 Feb 2014 23:24:39 +0100 + -- Mikhail Gusarov Sun, 23 Mar 2014 19:04:13 +0100 diff --git a/debian/rspamd.default b/debian/rspamd.default deleted file mode 100644 index 2676fcae9a..0000000000 --- a/debian/rspamd.default +++ /dev/null @@ -1,2 +0,0 @@ -RSPAMD_USERNAME=_rspamd -RSPAMD_GROUPNAME=_rspamd diff --git a/debian/rspamd.init b/debian/rspamd.init index 629f43ebe8..0c84118dae 100755 --- a/debian/rspamd.init +++ b/debian/rspamd.init @@ -20,15 +20,10 @@ DAEMON_ARGS="-c /etc/rspamd/rspamd.conf" DESC="rapid spam filtering system" PIDFILE=/run/rspamd/$NAME.pid SCRIPTNAME=/etc/init.d/$NAME -RSPAMD_USERNAME=_rspamd -RSPAMD_GROUPNAME=_rspamd # Exit if the package is not installed [ -x "$DAEMON" ] || exit 0 -# Read configuration variable file if it is present -[ -r /etc/default/$NAME ] && . /etc/default/$NAME - # Load the VERBOSE setting and other rcS variables . /lib/init/vars.sh @@ -45,11 +40,11 @@ do_start() # 0 if daemon has been started # 1 if daemon was already running # 2 if daemon could not be started - mkdir -m 755 $RSPAMD_USERNAME:$RSPAMD_GROUPNAME -p /run/rspamd + mkdir -m 755 _rspamd:_rspamd -p /run/rspamd start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON --test > /dev/null \ || return 1 start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON -- \ - $DAEMON_ARGS -u $RSPAMD_USERNAME -g $RSPAMD_GROUPNAME \ + $DAEMON_ARGS -u _rspamd -g _rspamd \ || return 2 }