DisOrder 4.2

[disorder] / debian / config.disorder-server

diff --git a/debian/config.disorder-server b/debian/config.disorder-server
index 3389538c738b10db159a414ba0429030489166eb..9dc03be7e809cf9fb72521cee23f3be46b445976 100755 (executable)
--- a/debian/config.disorder-server
+++ b/debian/config.disorder-server
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2004, 2005, 2007 Richard Kettlewell
+# Copyright (C) 2004-2008 Richard Kettlewell
 #
 # 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
@@ -22,47 +22,27 @@ set -e
 
 . /usr/share/debconf/confmodule
 
+# If we don't have any preconception about the local character encoding then
+# try to use the system one.
+db_get disorder/encoding || true
+if test "x$RET" = x; then
+  eval `locale -k charmap`
+  db_set disorder/encoding "$charmap"
+fi
+
 db_input high disorder/roots || true
 db_input high disorder/encoding || true
 db_input high disorder/port || true
 db_input medium disorder/scratches || true
-db_input medium disorder/server-name || true
+db_input high disorder/mail_sender || true
+db_input high disorder/interface || true
 db_go || true
 
-db_get disorder/roots || true
-roots="$RET"
-db_get disorder/scratches || true
-scratches="$RET"
-db_get disorder/encoding || true
-encoding="$RET"
-db_get disorder/server-name || true
-server_name="$RET"
-db_get disorder/port || true
-port="$RET"
+db_get disorder/interface || true
+interface="$RET"
 
-mkdir -p /etc/disorder
-cat > /etc/disorder/conf.debconf.new <<EOF
-# created automatically from debconf information
-# do not edit manually
-# run 'dpkg-reconfigure disorder' instead
-EOF
-echo >> /etc/disorder/conf.debconf.new
-echo "# Collection roots"  >> /etc/disorder/conf.debconf.new
-for r in $roots; do
-  echo "collection fs $encoding $r" >> /etc/disorder/conf.debconf.new
-done
-echo >> /etc/disorder/conf.debconf.new
-echo "# Scratches" >> /etc/disorder/conf.debconf.new
-for s in $scratches; do
-  echo "scratch $s" >> /etc/disorder/conf.debconf.new
-done
-echo >> /etc/disorder/conf.debconf.new
-echo "# Canonical URL of web interface" >> /etc/disorder/conf.debconf.new
-echo "url http://$server_name/cgi-bin/disorder/disorder" >> /etc/disorder/conf.debconf.new
-if test "$port" != none && test "$port" != ""; then
-  echo >> /etc/disorder/conf.debconf.new
-  echo "# Listen for remote clients" >> /etc/disorder/conf.debconf.new
-  echo "listen 0.0.0.0 $port" >> /etc/disorder/conf.debconf.new
+if test "x$interface" = xnetwork; then
+  db_input high disorder/mcast_address || true
+  db_input high disorder/mcast_port || true
+  db_go || true
 fi
-
-mv /etc/disorder/conf.debconf.new /etc/disorder/conf.debconf