angelos 14/04/15 16:35:25 Added: mpd-0.18.conf.patch mpd2.init Log: Change init script to use mpd's own forking mechanism (bug #507734) (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 84F20B43)
Revision Changes Path 1.1 media-sound/mpd/files/mpd-0.18.conf.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/mpd/files/mpd-0.18.conf.patch?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/mpd/files/mpd-0.18.conf.patch?rev=1.1&content-type=text/plain Index: mpd-0.18.conf.patch =================================================================== diff --git a/doc/mpdconf.dist b/doc/mpdconf.dist index 470a5c9..9f595a6 100644 --- a/doc/mpdconf.dist +++ b/doc/mpdconf.dist @@ -10,14 +10,14 @@ # be disabled and audio files will only be accepted over ipc socket (using # file:// protocol) or streaming files over an accepted protocol. # -#music_directory "~/music" +music_directory "/var/lib/mpd/music" # # This setting sets the MPD internal playlist directory. The purpose of this # directory is storage for playlists created by MPD. The server will use # playlist files not created by the server but only if they are in the MPD # format. This setting defaults to playlist saving being disabled. # -#playlist_directory "~/.mpd/playlists" +playlist_directory "/var/lib/mpd/playlists" # # This setting sets the location of the MPD database. This file is used to # load the database at server start up and store the database while the @@ -25,7 +25,7 @@ # MPD to accept files over ipc socket (using file:// protocol) or streaming # files over an accepted protocol. # -#db_file "~/.mpd/database" +db_file "/var/lib/mpd/database" # # These settings are the locations for the daemon log files for the daemon. # These logs are great for troubleshooting, depending on your log_level @@ -34,20 +34,20 @@ # The special value "syslog" makes MPD use the local syslog daemon. This # setting defaults to logging to syslog, otherwise logging is disabled. # -#log_file "~/.mpd/log" +log_file "/var/lib/mpd/log" # # This setting sets the location of the file which stores the process ID -# for use of mpd --kill and some init scripts. This setting is disabled by -# default and the pid file will not be stored. +# for use of mpd --kill and some init scripts. This setting is required when +# using the Gentoo init script. # -#pid_file "~/.mpd/pid" +pid_file "/var/lib/mpd/pid" # # This setting sets the location of the file which contains information about # most variables to get MPD back into the same general shape it was in before # it was brought down. This setting is disabled by default and the server # state will be reset on server start up. # -#state_file "~/.mpd/state" +state_file "/var/lib/mpd/state" # # The location of the sticker database. This is a database which # manages dynamic information attached to songs. @@ -64,7 +64,7 @@ # initialization. This setting is disabled by default and MPD is run as the # current user. # -#user "nobody" +user "mpd" # # This setting specifies the group that MPD will run as. If not specified # primary group of user specified with "user" setting will be used (if set). @@ -78,10 +78,10 @@ # This setting can deny access to control of the daemon. # # For network -#bind_to_address "any" +bind_to_address "localhost" # # And for Unix Socket -#bind_to_address "~/.mpd/socket" +bind_to_address "/var/lib/mpd/socket" # # This setting is the TCP port that is desired for the daemon to get assigned # to. 1.1 media-sound/mpd/files/mpd2.init file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/mpd/files/mpd2.init?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/mpd/files/mpd2.init?rev=1.1&content-type=text/plain Index: mpd2.init =================================================================== #!/sbin/runscript # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/files/mpd2.init,v 1.1 2014/04/15 16:35:25 angelos Exp $ depend() { need localmount use net netmount nfsmount alsasound esound pulseaudio } checkconfig() { if ! [ -f /etc/mpd.conf ]; then eerror "Configuration file /etc/mpd.conf does not exist." return 1 fi if ! grep -q ^pid_file /etc/mpd.conf; then eerror "Invalid configuration: pid_file needs to be set." return 1 fi return 0 } start() { checkconfig || return 1 ebegin "Starting Music Player Daemon" start-stop-daemon --start --quiet --exec /usr/bin/mpd -- /etc/mpd.conf 2>/dev/null eend $? } stop() { ebegin "Stopping Music Player Daemon" /usr/bin/mpd --kill eend $? }
