update default config for present environment

[disorder] / examples / config.sample.in

diff --git a/examples/config.sample.in b/examples/config.sample.in
index 324f2308b3de9321e8e765443885cf77f5723c25..280042197b6ad269f3e921685f8ba7ca68537802 100644 (file)
--- 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