From 0581deeae30cae3eacf6b3a30b980c84f21b083f Mon Sep 17 00:00:00 2001 Message-Id: <0581deeae30cae3eacf6b3a30b980c84f21b083f.1716627855.git.mdw@distorted.org.uk> From: Mark Wooding Date: Mon, 31 Dec 2007 17:15:23 +0000 Subject: [PATCH] update default config for present environment Organization: Straylight/Edgeware From: Richard Kettlewell --- debian/etc.disorder.config | 18 +++++------------- examples/config.sample.in | 16 ++++------------ 2 files changed, 9 insertions(+), 25 deletions(-) diff --git a/debian/etc.disorder.config b/debian/etc.disorder.config index 2e97422..2faed13 100644 --- a/debian/etc.disorder.config +++ b/debian/etc.disorder.config @@ -19,7 +19,7 @@ player *.ogg execraw disorder-decode player *.wav execraw disorder-decode player *.flac execraw disorder-decode -# Track length calculators +# Track length calculatorsiso-i # # If you add new formats then can add a plugin module to calculate the # length of a track. See disorder(3) for the interface. @@ -28,21 +28,13 @@ tracklength *.ogg disorder-tracklength tracklength *.wav disorder-tracklength tracklength *.flac disorder-tracklength -# Trust the web user and root. Trusted users can stop the server or -# pretend to be other users. -# -# This line can be removed after upgrade to 2.1 or later, or if the initial -# install is of 2.1 or later. -trust www-data root +# This line just ensures that the pre-existing root user gets admin +# rights and can be removed after upgrade to 2.1 or later, or if the +# initial install is of 2.1 or later. +trust root # Run as user jukebox. user jukebox -# Volume control settings. -# The device name to use -mixer /dev/mixer -# The channel to control -channel pcm - # include debconf configuration include /etc/disorder/conf.debconf diff --git a/examples/config.sample.in b/examples/config.sample.in index 324f230..2800421 100644 --- a/examples/config.sample.in +++ b/examples/config.sample.in @@ -29,18 +29,10 @@ collection fs ISO-8859-1 /export/mp3 scratch pkgdatadir/slap.ogg scratch pkgdatadir/scratch.ogg -# Trust the web user and root. Trusted users can stop the server or -# pretend to be other users. -# -# This line can be removed after upgrade to 2.1 or later, or if the initial -# install is of 2.1 or later. -trust www-data root +# This line just ensures that the pre-existing root user gets admin +# rights and can be removed after upgrade to 2.1 or later, or if the +# initial install is of 2.1 or later. +trust root # Run as user jukebox. This must exist in /etc/passwd! user jukebox - -# Volume control settings. -# The device name to use -mixer /dev/mixer -# The channel to control -channel pcm -- [mdw]