[gentoo-commits] gentoo-x86 commit in media-sound/mpd/files: mpd.conf.patch mpd.init

[gentoo-commits] gentoo-x86 commit in media-sound/mpd/files: mpd.conf.patch mpd.init

[Christoph Mende (angelos)]

angelos     10/09/10 07:55:07

  Added:                mpd.conf.patch mpd.init
  Log:
  Tweak default pid/log paths (bug #331723), fix init script dependencies (bug #331725), reduce init script noise (bug #331727) and convert init script to s-s-d (bug #331729)
  (Portage version: 2.1.8.3/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  media-sound/mpd/files/mpd.conf.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/mpd/files/mpd.conf.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/mpd/files/mpd.conf.patch?rev=1.1&content-type=text/plain

Index: mpd.conf.patch
===================================================================
diff --git a/doc/mpdconf.example b/doc/mpdconf.example
index 11b14bd..6b24322 100644
--- a/doc/mpdconf.example
+++ b/doc/mpdconf.example
@@ -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,7 +34,7 @@
 # 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/log/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
@@ -47,7 +47,7 @@
 # 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"
 #
 ###############################################################################
 
@@ -59,17 +59,17 @@
 # initialization. This setting is disabled by default and MPD is run as the
 # current user.
 #
-#user				"nobody"
+user			"mpd"
 #
 # This setting sets the address for the daemon to listen on. Careful attention
 # should be paid if this is assigned to anything other then the default, any.
 # 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/mpd.init

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/mpd/files/mpd.init?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/mpd/files/mpd.init?rev=1.1&content-type=text/plain

Index: mpd.init
===================================================================
#!/sbin/runscript
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/files/mpd.init,v 1.1 2010/09/10 07:55:07 angelos Exp $

depend() {
	need localmount
	use net netmount nfsmount alsa esound pulseaudio
} 

checkconfig() {
	if ! [ -f /etc/mpd.conf ]; then
		eerror "Configuration file /etc/mpd.conf does not exist."
		return 1
	fi

	return 0
}

start() {
	checkconfig || return 1

	ebegin "Starting Music Player Daemon" 
	start-stop-daemon --start --quiet --background --exec /usr/bin/mpd --pidfile /var/run/mpd.pid --make-pidfile -- --no-daemon /etc/mpd.conf 2>/dev/null
	eend $?
}

stop() {
	ebegin "Stopping Music Player Daemon"
	start-stop-daemon --stop --exec /usr/bin/mpd --pidfile /var/run/mpd.pid
	eend $? 
}