- echo allow root "$rootpw" > /etc/disorder/config.private.new
- echo allow www-data "$webpw" >> /etc/disorder/config.private.new
- chgrp jukebox /etc/disorder/config.private.new
+fix_configuration() {
+ # Once the server has started up, we can remove some of the obsolete
+ # directives from the config file.
+ if grep -q ^trust /etc/disorder/config; then
+ echo "Removing obsolete 'trust' directive from /etc/disorder/config"
+ sed < /etc/disorder/config > /etc/disorder/config.new \
+ 's/^trust/#trust/'
+ chmod 644 /etc/disorder/config.new
+ mv /etc/disorder/config.new /etc/disorder/config
+ fi
+ if test -e /etc/disorder/config.private \
+ && grep -q ^allow /etc/disorder/config.private; then
+ echo "Removing obsolete 'allow' directive(s) from /etc/disorder/config.private"
+ u=$(umask)
+ umask 077
+ sed < /etc/disorder/config.private > /etc/disorder/config.private.new \
+ 's/^allow/#allow/'
+ umask $u