config files note that "trust" can be removed

[disorder] / examples / config.sample.in

diff --git a/examples/config.sample.in b/examples/config.sample.in
index 5648b43a427bdeeac87acf7f9841a7bcc6de9aa0..ced7585684e2eed3d15ec5ff16b0dfc6c3bda0e3 100644 (file)
--- a/examples/config.sample.in
+++ b/examples/config.sample.in
@@ -12,6 +12,15 @@ player *.ogg execraw disorder-decode
 player *.wav execraw disorder-decode
 player *.flac execraw disorder-decode
 
+# Track length calculators
+#
+# If you add new formats then can add a plugin module to calculate the
+# length of a track.  See disorder(3) for the interface.
+tracklength *.mp3 disorder-tracklength
+tracklength *.ogg disorder-tracklength
+tracklength *.wav disorder-tracklength
+tracklength *.flac disorder-tracklength
+
 # Use the fs module to list files under /export/mp3.  The encoding
 # is ISO-8859-1.
 collection fs ISO-8859-1 /export/mp3
@@ -25,6 +34,9 @@ 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
 
 # Run as user jukebox.  This must exist in /etc/passwd!
@@ -35,13 +47,3 @@ user jukebox
 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