Make tests/play.py more reliable.

[disorder] / debian / config.disorder-server

diff --git a/debian/config.disorder-server b/debian/config.disorder-server
index 11bec83229406a545077b5b4b89e46f8c8d4a83d..83ffd80e760500e2a00b5340adf3e72a4b1b4c83 100755 (executable)
--- a/debian/config.disorder-server
+++ b/debian/config.disorder-server
@@ -26,6 +26,8 @@ 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/smtp_server || true
+db_input high disorder/mail_sender || true
 db_go || true
 
 db_get disorder/roots || true
@@ -36,6 +38,10 @@ db_get disorder/encoding || true
 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"
 
 mkdir -p /etc/disorder
 cat > /etc/disorder/conf.debconf.new <<EOF
@@ -43,16 +49,31 @@ cat > /etc/disorder/conf.debconf.new <<EOF
 # 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
+
+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
+  echo "mail_sender $mail_sender" >> /etc/disorder/conf.debconf.new
+fi
+
 if test "$port" != none && test "$port" != ""; then
   echo >> /etc/disorder/conf.debconf.new
   echo "# Listen for remote clients" >> /etc/disorder/conf.debconf.new