1 |
angelos 08/12/26 19:20:19 |
2 |
|
3 |
Modified: mpdconf1.patch |
4 |
Log: |
5 |
Version bump |
6 |
(Portage version: 2.2_rc17/cvs/Linux 2.6.28 x86_64) |
7 |
|
8 |
Revision Changes Path |
9 |
1.3 media-sound/mpd/files/mpdconf1.patch |
10 |
|
11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/mpd/files/mpdconf1.patch?rev=1.3&view=markup |
12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/mpd/files/mpdconf1.patch?rev=1.3&content-type=text/plain |
13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/mpd/files/mpdconf1.patch?r1=1.2&r2=1.3 |
14 |
|
15 |
Index: mpdconf1.patch |
16 |
=================================================================== |
17 |
RCS file: /var/cvsroot/gentoo-x86/media-sound/mpd/files/mpdconf1.patch,v |
18 |
retrieving revision 1.2 |
19 |
retrieving revision 1.3 |
20 |
diff -u -r1.2 -r1.3 |
21 |
--- mpdconf1.patch 20 Dec 2008 15:13:00 -0000 1.2 |
22 |
+++ mpdconf1.patch 26 Dec 2008 19:20:19 -0000 1.3 |
23 |
@@ -1,51 +1,79 @@ |
24 |
---- doc/mpdconf.example 2008-12-03 05:01:07.000000000 +0100 |
25 |
-+++ doc/mpdconf.example.gentoo 2008-12-05 23:25:32.000000000 +0100 |
26 |
-@@ -1,12 +1,12 @@ |
27 |
+diff -u -r a/doc/mpdconf.example b/doc/mpdconf.example |
28 |
+--- a/doc/mpdconf.example 2008-12-26 20:07:33.000000000 +0100 |
29 |
++++ b/doc/mpdconf.example 2008-12-26 20:09:37.000000000 +0100 |
30 |
+@@ -1,4 +1,4 @@ |
31 |
-# An example configuration file for MPD |
32 |
+# A default Gentoo configuration file for MPD |
33 |
# See the mpd.conf man page for a more detailed description of each parameter. |
34 |
|
35 |
- ######################## REQUIRED PATHS ######################## |
36 |
--music_directory "~/music" |
37 |
--playlist_directory "~/.mpd/playlists" |
38 |
--db_file "~/.mpd/mpd.db" |
39 |
--log_file "~/.mpd/mpd.log" |
40 |
--error_file "~/.mpd/mpd.error" |
41 |
-+music_directory "/var/lib/mpd/music" |
42 |
-+playlist_directory "/var/lib/mpd/playlists" |
43 |
-+db_file "/var/lib/mpd/database" |
44 |
-+log_file "/var/log/mpd/mpd.log" |
45 |
-+error_file "/var/log/mpd/mpd.error.log" |
46 |
- #follow_outside_symlinks "yes" |
47 |
- #follow_inside_symlinks "yes" |
48 |
- ################################################################ |
49 |
-@@ -17,13 +17,13 @@ |
50 |
- # If you wish to use mpd --kill to stop MPD, then you must |
51 |
- # specify a file here in which to store MPD's process ID. |
52 |
- # |
53 |
--#pid_file "~/.mpd/mpd.pid" |
54 |
-+pid_file "/var/run/mpd/mpd.pid" |
55 |
- # |
56 |
- # If specified, MPD will save its current state (playlist, |
57 |
- # current song, playing/paused, etc.) at exit. This will be |
58 |
- # used to restore the session the next time it is run. |
59 |
+ # Required files and directories ############################################## |
60 |
+@@ -6,27 +6,27 @@ |
61 |
+ # This setting controls the top directory which MPD will search to discover the |
62 |
+ # available audio files and add them to the daemon's online database. |
63 |
+ # |
64 |
+-music_directory "~/music" |
65 |
++music_directory "/var/lib/mpd/music" |
66 |
+ # |
67 |
+ # This setting sets the MPD internal playlist directory. The purpose of this |
68 |
+ # directory is storage for playlists created by MPD. The server will use |
69 |
+ # playlist files not created by the server but only if they are in the MPD |
70 |
+ # format. |
71 |
+ # |
72 |
+-playlist_directory "~/.mpd/playlists" |
73 |
++playlist_directory "/var/lib/mpd/playlists" |
74 |
+ # |
75 |
+ # This setting sets the location of the MPD database. This file is used to |
76 |
+ # load the database at server start up and store the database while the |
77 |
+ # server is not up. |
78 |
+ # |
79 |
+-db_file "~/.mpd/database" |
80 |
++db_file "/var/lib/mpd/database" |
81 |
+ # |
82 |
+ # These settings are the locations for the daemon log files for the daemon. |
83 |
+ # These logs are great for troubleshooting, depending on your log_level |
84 |
+ # settings. |
85 |
+ # |
86 |
+-log_file "~/.mpd/log" |
87 |
+-error_file "~/.mpd/error-log" |
88 |
++log_file "/var/log/mpd/mpd.log" |
89 |
++error_file "/var/log/mpd/mpd.error.log" |
90 |
+ ############################################################################### |
91 |
+ |
92 |
+ |
93 |
+@@ -36,13 +36,13 @@ |
94 |
+ # for use of mpd --kill and some init scripts. This setting is disabled by |
95 |
+ # default. |
96 |
# |
97 |
--#state_file "~/.mpd/mpdstate" |
98 |
-+state_file "/var/lib/mpd/state" |
99 |
+-#pid_file "~/.mpd/pid" |
100 |
++pid_file "/var/run/mpd/mpd.pid" |
101 |
# |
102 |
- ################################################################ |
103 |
- |
104 |
-@@ -35,11 +35,11 @@ |
105 |
- # started by. If left unspecified, MPD will not drop root |
106 |
- # privileges at all (not recommended). |
107 |
+ # This setting sets the location of the file which contains information about |
108 |
+ # most variables to get MPD back into the same general shape it was in before |
109 |
+ # it was brought down. This setting is disabled by default. |
110 |
# |
111 |
--#user "nobody" |
112 |
-+user "mpd" |
113 |
+-#state_file "~/.mpd/state" |
114 |
++state_file "/var/lib/mpd/state" |
115 |
# |
116 |
- # The address and port to listen on. |
117 |
+ ############################################################################### |
118 |
+ |
119 |
+@@ -55,17 +55,17 @@ |
120 |
+ # unprivileged user. This setting is disabled by default, and the server will |
121 |
+ # run as root. |
122 |
+ # |
123 |
+-#user "nobody" |
124 |
++user "mpd" |
125 |
+ # |
126 |
+ # This setting sets the address for the daemon to listen on. Careful attention |
127 |
+ # should be paid if this is assigned to anything other then the default, any. |
128 |
+ # This setting can deny access to control of the daemon. |
129 |
+ # |
130 |
+ # For network |
131 |
+-#bind_to_address "any" |
132 |
++bind_to_address "localhost" |
133 |
+ # |
134 |
+ # And for Unix Socket |
135 |
+-#bind_to_address "~/.mpd/socket" |
136 |
++bind_to_address "/var/lib/mpd/socket" |
137 |
# |
138 |
--#bind_to_address "any" |
139 |
-+bind_to_address "localhost" |
140 |
- #port "6600" |
141 |
+ # This setting is the port that is desired for the daemon to get assigned to. |
142 |
# |
143 |
- # Controls the amount of information that is logged. Can be |