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

diff --git a/debian/postinst.disorder-server b/debian/postinst.disorder-server
index b5bfaad..316f1e9 100755
--- a/debian/postinst.disorder-server
+++ b/debian/postinst.disorder-server
@@ -1,22 +1,20 @@
 #! /bin/sh
 #
 # This file is part of DisOrder
-# Copyright (C) 2004, 2007, 2008 Richard Kettlewell
+# Copyright (C) 2004, 2007-2009 Richard Kettlewell
 #
-# This program is free software; you can redistribute it and/or modify
+# This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
 #
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-# USA
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
 set -e
@@ -26,6 +24,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 jukebox audio || true
 }
 
 configure_init_d() {
@@ -33,10 +34,31 @@ configure_init_d() {
 }
 
 restart_server() {
-  /etc/init.d/disorder restart
-  # Wait for the server to get going.  This is a horrid bodge and ought
-  # to be done away with, but is required for the time being.  Sorry.
-  sleep 5
+  local first
+  local time
+  invoke-rc.d disorder restart
+  # Wait for the server to start
+  first=true
+  time=0
+  while :; do
+    if disorder version >/dev/null 2>&1; then
+      break
+    else
+      if [ $time -gt 30 ]; then
+        echo
+        echo "Server did not stabilise in a reasonable amount of time"
+        exit 1
+      fi
+      if $first; then
+	printf "Waiting for server to stabilise"
+	first=false
+      fi
+      printf "."
+      sleep 1
+    fi
+    time=`expr $time + 1`
+  done
+  echo
 }
 
 setup_guest() {
@@ -96,8 +118,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 +148,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
@@ -173,10 +187,10 @@ reconfigure )
   create_config
   ;;
 abort-upgrade )
-  /etc/init.d/disorder restart
+  invoke-rc.d disorder restart
   ;;
 reconfigure )
-  /etc/init.d/disorder reload
+  invoke-rc.d disorder reload
   ;;
 esac