X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/blobdiff_plain/f446d4af1ed844684e34cc0672edb2d5ccf4ea88..5aff007d8fcfb4c6cc3c3627ae15f45562db7a0d:/examples/config.sample.in

diff --git a/examples/config.sample.in b/examples/config.sample.in
index 5648b43..4e6c629 100644
--- a/examples/config.sample.in
+++ b/examples/config.sample.in
@@ -2,46 +2,18 @@
 #
 # You WILL need to edit this from the distributed version!
 
-# Player programs
-#
-# You can add new players for other formats.  For gapless and network
-# play to work, you will need a player that can use libao and DisOrder's
-# special driver - see "LIBAO driver" in disorder_config(5)
-player *.mp3 execraw disorder-decode
-player *.ogg execraw disorder-decode
-player *.wav execraw disorder-decode
-player *.flac execraw disorder-decode
-
 # Use the fs module to list files under /export/mp3.  The encoding
 # is ISO-8859-1.
 collection fs ISO-8859-1 /export/mp3
 
-# Don't leave a gap between tracks.
-gap 0
-
 # Scratch tracks.  You can add your own tracks here.
 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.
-trust www-data root
+# This line just ensures that the pre-existing root user gets admin
+# rights and can be removed after upgrade to 3.0 or later, or if the
+# initial install is of 3.0 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
-
-# URL of the web interface
-url http://jukebox.anjou.terraraq.org.uk/
-
-# Stopwords (i.e. ignored words) for the track search facility.
-stopword 01 02 03 04 05 06 07 08 09 10
-stopword 1 2 3 4 5 6 7 8 9
-stopword 11 12 13 14 15 16 17 18 19 20
-stopword 21 22 23 24 25 26 27 28 29 30
-stopword the a an and to too in on of we i am as im for is