remove obsolete debian web config stuff

diff --git a/README b/README
index 8692efa6f9dcecd96c509878f1367cc075a04625..9d80eb4a436136635d97dd64f28bbc2187a33584 100644 (file)
--- a/README
+++ b/README
@@ -150,8 +150,8 @@ skip steps 1 to 6 and configure it via debconf.  This is strongly recommended!
    start up correctly there should be an error message.  Correct the problem
    and try again.
 
    start up correctly there should be an error message.  Correct the problem
    and try again.
 

-7. After a minute it should start to play something.  Try scratching it (as
-   root):
+7. After a short while it should start to play something.  Try scratching it
+   (as root):

 
      disorder scratch
 
 
      disorder scratch
 

diff --git a/debian/config.disorder-server b/debian/config.disorder-server
index 3389538c738b10db159a414ba0429030489166eb..11bec83229406a545077b5b4b89e46f8c8d4a83d 100755 (executable)
--- a/debian/config.disorder-server
+++ b/debian/config.disorder-server
@@ -26,7 +26,6 @@ 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 high disorder/encoding || true
 db_input high disorder/port || true
 db_input medium disorder/scratches || true

-db_input medium disorder/server-name || true

 db_go || true
 
 db_get disorder/roots || true
 db_go || true
 
 db_get disorder/roots || true


@@ -35,8 +34,6 @@ db_get disorder/scratches || true
 scratches="$RET"
 db_get disorder/encoding || true
 encoding="$RET"
 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/port || true
 port="$RET"
 


@@ -56,9 +53,6 @@ echo "# Scratches" >> /etc/disorder/conf.debconf.new
 for s in $scratches; do
   echo "scratch $s" >> /etc/disorder/conf.debconf.new
 done
 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
 if test "$port" != none && test "$port" != ""; then
   echo >> /etc/disorder/conf.debconf.new
   echo "# Listen for remote clients" >> /etc/disorder/conf.debconf.new

diff --git a/debian/control b/debian/control
index 45ce7e7e141c012f1dd67d83c3bba882bb2b53d3..a1523aa68d240db675db4163530730847a6972f4 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -26,7 +26,7 @@ Package: disorder-server
 Architecture: any
 Section: sound
 Priority: extra
 Architecture: any
 Section: sound
 Priority: extra

-Depends: disorder,httpd-cgi,pwgen,sox,debconf,${shlibs:Depends}
+Depends: disorder,httpd-cgi,sox,debconf,${shlibs:Depends}

 Suggests: disorder-playrtp,disobedience
 Description: Play random or selected digital audio files continuously
  DisOrder is a software jukebox.  It can play OGG, MP3, WAV and FLAC files,
 Suggests: disorder-playrtp,disobedience
 Description: Play random or selected digital audio files continuously
  DisOrder is a software jukebox.  It can play OGG, MP3, WAV and FLAC files,

diff --git a/debian/postinst.disorder-server b/debian/postinst.disorder-server
index 53402b55815cc448ae7d4ccadd508c8d4a74dca7..4ee3e0a8608709a56035e97535a9e6ad30fc42bf 100755 (executable)
--- a/debian/postinst.disorder-server
+++ b/debian/postinst.disorder-server
@@ -43,43 +43,6 @@ configure )
   else
     add_jukebox_user
   fi
   else
     add_jukebox_user
   fi

-  if test ! -f /etc/disorder/config.private; then
-    rootpw=`pwgen 16 1`
-    webpw=`pwgen 16 1`
-    if test -z "$rootpw" || test -z "$webpw"; then
-      # We used to ignore the exit status of pwgen due to a bug in an old
-      # version of Debian.  That bug seems to be gone, but this check is
-      # harmless and could catch future bugs.
-      echo "$0: pwgen failed" 1>&2
-      exit 1
-    fi
-    # We set the umask so that private files aren't transiently world-readable
-    u=`umask`
-    umask 077
-
-    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
-    chmod 640 /etc/disorder/config.private.new
-    mv /etc/disorder/config.private.new /etc/disorder/config.private
-
-    if test ! -f /etc/disorder/config.www-data; then
-      echo password "$webpw" > /etc/disorder/config.www-data.new
-      chgrp www-data /etc/disorder/config.www-data.new
-      chmod 640 /etc/disorder/config.www-data.new
-      mv /etc/disorder/config.www-data.new /etc/disorder/config.www-data
-    fi
-    umask $u
-  fi
-
-  if test ! -f /etc/disorder/http.users; then
-    u=`umask`
-    umask 077
-    touch /etc/disorder/http.users
-    chgrp www-data /etc/disorder/http.users
-    chmod 640 /etc/disorder/http.users
-    umask $u
-  fi

   chown jukebox:jukebox /var/lib/disorder
   configure_init_d
   restart_server
   chown jukebox:jukebox /var/lib/disorder
   configure_init_d
   restart_server

diff --git a/debian/templates.disorder-server b/debian/templates.disorder-server
index d2dfe9729199e561110207f59d389fd908d8ace5..b1a14c4424ecde9c98ebbb34c88143b1d0ad2570 100644 (file)
--- a/debian/templates.disorder-server
+++ b/debian/templates.disorder-server
@@ -20,12 +20,6 @@ Description: Scratch files
  by spaces.  Leave this blank if you don't want any scratch sounds.
  All filenames should be absolute path names.
 
  by spaces.  Leave this blank if you don't want any scratch sounds.
  All filenames should be absolute path names.
 

-Template: disorder/server-name
-Type: string
-Default: localhost
-Description: Web server hostname
- Enter the hostname that the web interface will appear under.
-

 Template: disorder/port
 Type: string
 Default: none
 Template: disorder/port
 Type: string
 Default: none