X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/blobdiff_plain/1c934d2a90cf12ee63ab3bb06b57715ed0e33add..ed4ad25d8f10c325625319a5d5cb7a285c394705:/debian/postinst.disorder-server

diff --git a/debian/postinst.disorder-server b/debian/postinst.disorder-server
index b5bfaad..9e51648 100755
--- a/debian/postinst.disorder-server
+++ b/debian/postinst.disorder-server
@@ -26,6 +26,9 @@ set -e
 add_jukebox_user() {
   adduser --quiet --system --group --shell /bin/sh --home /var/lib/disorder \
     --no-create-home jukebox
+  # If it happens that there's no audio group we don't fail; perhaps only
+  # network play was required.
+  adduser --quiet jukebox audio || true
 }
 
 configure_init_d() {
@@ -96,8 +99,6 @@ create_config() {
   encoding="$RET"
   db_get disorder/port || true
   port="$RET"
-  db_get disorder/smtp_server || true
-  smtp_server="$RET"
   db_get disorder/mail_sender || true
   mail_sender="$RET"
   db_get disorder/interface || true
@@ -128,12 +129,6 @@ EOF
     echo "scratch $s" >> /etc/disorder/conf.debconf.new
   done
 
-  if test "$mail_sender" != ""; then
-    echo "" >> /etc/disorder/conf.debconf.new
-    echo "# SMTP server" >> /etc/disorder/conf.debconf.new
-    echo "smtp_server $smtp_server" >> /etc/disorder/conf.debconf.new
-  fi
-
   if test "$mail_sender" != ""; then
     echo "" >> /etc/disorder/conf.debconf.new
     echo "# Source mail address" >> /etc/disorder/conf.debconf.new