[gentoo-commits] gentoo-x86 commit in media-sound/subsonic-bin/files: subsonic.initd

[Jason Zaman (perfinion)]

perfinion    15/08/05 10:03:58

  Modified:             subsonic.initd
  Log:
  revbump, add selinux policy and adjust init script to match
  
  (Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 
0x7EF137EC935B0EAF)

Revision  Changes    Path
1.2                  media-sound/subsonic-bin/files/subsonic.initd

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/subsonic-bin/files/subsonic.initd?rev=1.2&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/subsonic-bin/files/subsonic.initd?rev=1.2&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/subsonic-bin/files/subsonic.initd?r1=1.1&r2=1.2

Index: subsonic.initd
===================================================================
RCS file: 
/var/cvsroot/gentoo-x86/media-sound/subsonic-bin/files/subsonic.initd,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- subsonic.initd      11 Apr 2015 19:51:08 -0000      1.1
+++ subsonic.initd      5 Aug 2015 10:03:58 -0000       1.2
@@ -3,19 +3,22 @@
 
 SUBSONIC_HOME=${SUBSONIC_HOME:-/var/lib/${SVCNAME}}
 SUBSONIC_USER=${SUBSONIC_USER:-${SVCNAME}}
-PIDFILE=${PIDFILE:-${SUBSONIC_HOME}/subsonic.pid}
+PIDFILE=/run/subsonic/subsonic.pid
 
 depend() {
        after net
 }
 
 start() {
+       checkpath -dq -o subsonic:subsonic -m 755 /run/subsonic/
+
        ebegin "Starting ${SVCNAME}"
        start-stop-daemon \
                --start --user "${SUBSONIC_USER}" --name subsonic \
                --env HOME="${SUBSONIC_HOME}" --exec /usr/bin/subsonic \
+               --pidfile="${PIDFILE}" \
                --nicelevel "${NICELEVEL}" \
-               -- --pidfile="${PIDFILE}" \
+               -- \
                --home="${SUBSONIC_HOME}" \
                --host="${SUBSONIC_HOST}" \
                --port="${SUBSONIC_PORT}" \
@@ -25,6 +28,7 @@
                --default-music-folder="${SUBSONIC_DEFAULT_MUSIC_FOLDER}" \
                --default-podcast-folder="${SUBSONIC_DEFAULT_PODCAST_FOLDER}" \
                --default-playlist-folder="${SUBSONIC_DEFAULT_PLAYLIST_FOLDER}" 
\
+               --pidfile="${PIDFILE}" --quiet \
                ${SUBSONIC_OPTS}
        eend $?
 }
@@ -33,7 +37,7 @@
        ebegin "Stopping ${SVCNAME}"
        start-stop-daemon --stop --user "${SUBSONIC_USER}" \
                --pidfile "${PIDFILE}" \
-               --wait 30000 \
+               --wait 15000 \
                --progress
        eend $?
 }