* [gentoo-commits] gentoo-x86 commit in media-sound/mpd/files: mpdconf1.patch
@ 2008-12-20 15:13 Christoph Mende (angelos)
0 siblings, 0 replies; 2+ messages in thread
From: Christoph Mende (angelos) @ 2008-12-20 15:13 UTC (permalink / raw
To: gentoo-commits
angelos 08/12/20 15:13:01
Modified: mpdconf1.patch
Log:
Version bump and removed beta2 as mpdconf1.patch changed
(Portage version: 2.2_rc17/cvs/Linux 2.6.28-rc9 x86_64)
Revision Changes Path
1.2 media-sound/mpd/files/mpdconf1.patch
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/mpd/files/mpdconf1.patch?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/mpd/files/mpdconf1.patch?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/mpd/files/mpdconf1.patch?r1=1.1&r2=1.2
Index: mpdconf1.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-sound/mpd/files/mpdconf1.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mpdconf1.patch 5 Dec 2008 22:35:37 -0000 1.1
+++ mpdconf1.patch 20 Dec 2008 15:13:00 -0000 1.2
@@ -16,7 +16,7 @@
+db_file "/var/lib/mpd/database"
+log_file "/var/log/mpd/mpd.log"
+error_file "/var/log/mpd/mpd.error.log"
- #follow_outside_symlinks "no"
+ #follow_outside_symlinks "yes"
#follow_inside_symlinks "yes"
################################################################
@@ -17,13 +17,13 @@
^ permalink raw reply [flat|nested] 2+ messages in thread
* [gentoo-commits] gentoo-x86 commit in media-sound/mpd/files: mpdconf1.patch
@ 2008-12-26 19:20 Christoph Mende (angelos)
0 siblings, 0 replies; 2+ messages in thread
From: Christoph Mende (angelos) @ 2008-12-26 19:20 UTC (permalink / raw
To: gentoo-commits
angelos 08/12/26 19:20:19
Modified: mpdconf1.patch
Log:
Version bump
(Portage version: 2.2_rc17/cvs/Linux 2.6.28 x86_64)
Revision Changes Path
1.3 media-sound/mpd/files/mpdconf1.patch
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/mpd/files/mpdconf1.patch?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/mpd/files/mpdconf1.patch?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/mpd/files/mpdconf1.patch?r1=1.2&r2=1.3
Index: mpdconf1.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-sound/mpd/files/mpdconf1.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mpdconf1.patch 20 Dec 2008 15:13:00 -0000 1.2
+++ mpdconf1.patch 26 Dec 2008 19:20:19 -0000 1.3
@@ -1,51 +1,79 @@
---- doc/mpdconf.example 2008-12-03 05:01:07.000000000 +0100
-+++ doc/mpdconf.example.gentoo 2008-12-05 23:25:32.000000000 +0100
-@@ -1,12 +1,12 @@
+diff -u -r a/doc/mpdconf.example b/doc/mpdconf.example
+--- a/doc/mpdconf.example 2008-12-26 20:07:33.000000000 +0100
++++ b/doc/mpdconf.example 2008-12-26 20:09:37.000000000 +0100
+@@ -1,4 +1,4 @@
-# An example configuration file for MPD
+# A default Gentoo configuration file for MPD
# See the mpd.conf man page for a more detailed description of each parameter.
- ######################## REQUIRED PATHS ########################
--music_directory "~/music"
--playlist_directory "~/.mpd/playlists"
--db_file "~/.mpd/mpd.db"
--log_file "~/.mpd/mpd.log"
--error_file "~/.mpd/mpd.error"
-+music_directory "/var/lib/mpd/music"
-+playlist_directory "/var/lib/mpd/playlists"
-+db_file "/var/lib/mpd/database"
-+log_file "/var/log/mpd/mpd.log"
-+error_file "/var/log/mpd/mpd.error.log"
- #follow_outside_symlinks "yes"
- #follow_inside_symlinks "yes"
- ################################################################
-@@ -17,13 +17,13 @@
- # If you wish to use mpd --kill to stop MPD, then you must
- # specify a file here in which to store MPD's process ID.
- #
--#pid_file "~/.mpd/mpd.pid"
-+pid_file "/var/run/mpd/mpd.pid"
- #
- # If specified, MPD will save its current state (playlist,
- # current song, playing/paused, etc.) at exit. This will be
- # used to restore the session the next time it is run.
+ # Required files and directories ##############################################
+@@ -6,27 +6,27 @@
+ # This setting controls the top directory which MPD will search to discover the
+ # available audio files and add them to the daemon's online database.
+ #
+-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.
+ #
+-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
+ # server is not up.
+ #
+-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
+ # settings.
+ #
+-log_file "~/.mpd/log"
+-error_file "~/.mpd/error-log"
++log_file "/var/log/mpd/mpd.log"
++error_file "/var/log/mpd/mpd.error.log"
+ ###############################################################################
+
+
+@@ -36,13 +36,13 @@
+ # for use of mpd --kill and some init scripts. This setting is disabled by
+ # default.
#
--#state_file "~/.mpd/mpdstate"
-+state_file "/var/lib/mpd/state"
+-#pid_file "~/.mpd/pid"
++pid_file "/var/run/mpd/mpd.pid"
#
- ################################################################
-
-@@ -35,11 +35,11 @@
- # started by. If left unspecified, MPD will not drop root
- # privileges at all (not recommended).
+ # 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.
#
--#user "nobody"
-+user "mpd"
+-#state_file "~/.mpd/state"
++state_file "/var/lib/mpd/state"
#
- # The address and port to listen on.
+ ###############################################################################
+
+@@ -55,17 +55,17 @@
+ # unprivileged user. This setting is disabled by default, and the server will
+ # run as root.
+ #
+-#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"
#
--#bind_to_address "any"
-+bind_to_address "localhost"
- #port "6600"
+ # This setting is the port that is desired for the daemon to get assigned to.
#
- # Controls the amount of information that is logged. Can be
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2008-12-26 19:20 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-12-26 19:20 [gentoo-commits] gentoo-x86 commit in media-sound/mpd/files: mpdconf1.patch Christoph Mende (angelos)
-- strict thread matches above, loose matches on Subject: below --
2008-12-20 15:13 Christoph Mende (angelos)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox